this is stupid that it wont ignore the autogenerated files
Merge remote-tracking branch 'origin/master'

Conflicts:
	Course-Organizer/bin/Course-Organizer.apk
	Course-Organizer/bin/resources.ap_
	Course-Organizer/gen/com/teamswag/course_organizer/R.java