phaedra's example changes
Merge branch 'master' of https://github.com/buhny/She-lium

Conflicts:
bin/emptyExampleDebug.app/Contents/MacOS/emptyExampleDebug
src/testApp.cpp
trying to merge