ignore
Merge branch 'master' of https://github.com/mmanske/Vamu

Conflicts:
	.gitignore

Vamu/Vamu.xcodeproj/project.xcworkspace/xcuserdata/desenv001.xcuserdatad
/UserInterfaceState.xcuserstate