amoire x4
Merge branch 'master' of https://github.com/lilgorilla/amoire

Conflicts:
	amoire_wControl/.DS_Store
	amoire_wControl/bin/emptyExampleDebug.app/Contents/MacOS/emptyExampleDebug