Trying to get this to commit!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/UCDMobile/CourseParser/CourseParser.java