Stuff happened
Merge branch 'master' of https://github.com/munkbusiness/scheduleForKids

Conflicts:
	images/pausepicture.png
dsfsdf