Cleaned up a bit.
Merge branch 'master' of github.com:Portalen/Portalen

Conflicts:
	src/ofApp.cpp