Apon: add 2 circles representing NYC&SHG at the center of the screen
Merge branch 'master' of https://github.com/samua407/spaceAubio

Conflicts:
	bin/spaceAubioDebug.app/Contents/MacOS/spaceAubioDebug
	src/testApp.cpp
	src/testApp.h
merge with master