New thing
Trying again
Merge branch 'master' of ssh://github.com/AdamDorwart/CoursePlanner

Conflicts:
	src/com/courseplanner/CollegeInfo.java
	src/com/courseplanner/Course.java