testing the UI
rodet lidt med guien
Merge branch 'master' of https://github.com/Oddj0b/CRAA13

Conflicts:
	CRAA13.xcodeproj/project.pbxproj