just a sample
Merge remote-tracking branch 'origin/master'

Conflicts:
	Course-Organizer/bin/classes/com/teamswag/course_organizer/SemesterActivity$1.class
	Course-Organizer/bin/classes/com/teamswag/course_organizer/SemesterActivity.class
	Course-Organizer/res/layout/activity_startup.xml