Conflict 2

???
Merge branch 'master' of https://github.com/nilssoja/SnapToSchedule

Conflicts:
	bin/classes/com/example/snaptoschedule/MainActivity.class
	src/com/example/snaptoschedule/MainActivity.java