Cleaned
Merge remote-tracking branch 'origin/marcus-0.0.1'

Conflicts:
	bin/MahAppStudentGithub.apk
	bin/classes.dex
	bin/classes/se/mah/kd330a/project/R$color.class
	bin/classes/se/mah/kd330a/project/R$dimen.class
	bin/classes/se/mah/kd330a/project/R$drawable.class
	bin/classes/se/mah/kd330a/project/R$id.class
	bin/classes/se/mah/kd330a/project/R$layout.class
	bin/classes/se/mah/kd330a/project/R$menu.class
	bin/classes/se/mah/kd330a/project/R$plurals.class
	bin/classes/se/mah/kd330a/project/R$raw.class
	bin/classes/se/mah/kd330a/project/R$string.class
	bin/classes/se/mah/kd330a/project/R$style.class
	bin/classes/se/mah/kd330a/project/R$xml.class
	bin/classes/se/mah/kd330a/project/framework/MainActivity.class
	bin/classes/se/mah/kd330a/project/itsl/FragmentITSL.class
	bin/classes/se/mah/kd330a/project/schedule/view/FragmentScheduleTabs.class
	bin/classes/se/mah/kd330a/project/schedule/view/FragmentScheduleWeek$ExpandableListViewAdapter.class
	bin/classes/se/mah/kd330a/project/schedule/view/FragmentScheduleWeekPager.class
	bin/classes/se/mah/kd330a/project/settings/data/ParseCourseData.class
	bin/classes/se/mah/kd330a/project/settings/view/SearchableDictionary.class
	bin/resources.ap_
	gen/se/mah/kd330a/project/R.java

Merge again.