various config testing
Merge branch 'master' of https://github.com/BYU-IS-Media/JavaScript-IA-BrainHoney

Conflicts:
	Server_Files/IA/courses/UNTITLED/demo-dev1.json