changed CSCI1200 to csci1200
merge conflict resolved
Merge branch 'develop' of http://github.com/JFrei86/HWserver into develop