4 commits

Author	SHA1	Message	Date
2Shirt	b268385e0b	Merge remote-tracking branch 'upstream/dev' into dev	2019-03-13 19:04:01 -06:00
2Shirt	648787913e	Fixed issues importing settings files	2019-03-13 19:02:35 -06:00
2Shirt	c45c1c9225	Merge remote-tracking branch 'upstream/dev' into dev ... * Fixes issues #54 & #55	2019-03-12 22:45:43 -06:00
2Shirt	af5281626b	Moved setup settings to separate file	2019-03-05 19:36:42 -07:00