Added MajorDatastoreBuilder
Updated web.xml with new servlet
Merge branch 'master' of ssh://github.com/AdamDorwart/CoursePlanner

Conflicts:
	src/com/courseplanner/helperFunctions.java