Finished adding all college info
College info finished
College info added
Merge branch 'master' of ssh://github.com/AdamDorwart/CoursePlanner

Conflicts:
	src/com/courseplanner/CollegeInfo.java
	src/com/courseplanner/CoursePlannerServlet.java
	src/com/courseplanner/DataStructureBuilder.java
	src/com/courseplanner/helperFunctions.java
	war/WEB-INF/classes/com/courseplanner/CoursePlannerServlet.class
College info finished
Merge branch 'master' of ssh://github.com/AdamDorwart/CoursePlanner