v1
Merge branch 'master' of https://github.com/BasO/MacApp

Conflicts:
	MacApp/main.m