testing again; adding files -> mapviewcontroller, missing content
This is working
sjsskddsj
Merge branch 'master' of https://github.com/ottihe/os67

Conflicts:
	.DS_Store