Feel the thunder!!!
Merge branch 'master' of ssh://github.com/AdamDorwart/CoursePlanner

Conflicts:
	war/WEB-INF/Major_Table.JSON