shit
Merge branch 'master' of https://github.com/jmichala/bearded-octo-robot

Conflicts:
	MorningOrganizer/src/com/pennapps/morningorganizer/MainActivity.java