Dagboek data inladen
Dagboek inladen
Merge branch 'master' of https://github.com/iliketorock/Mantl

Conflicts:
	Mantl.xcodeproj/project.pbxproj
	Mantl/Storyboard.storyboard