- Initial setup on mac mini
Merge branch 'master' of github.com:Portalen/Portalen

Conflicts:
	Portalen.xcodeproj/project.pbxproj
	src/ofApp.cpp
	src/ofApp.h