work from todays meeting
pushing
Merge remote-tracking branch 'origin/master'

Conflicts:
	Course-Organizer/bin/Course-Organizer.apk
	Course-Organizer/bin/classes.dex
	Course-Organizer/bin/dexedLibs/android-support-v4-9933bb8bd16c3ed836d25eab004172bd.jar
	Course-Organizer/bin/resources.ap_
	Course-Organizer/gen/com/teamswag/course_organizer/R.java