commit so I can pull
Merge branch 'master' of https://github.com/sebleedelisle/interplay

Conflicts:
	MotionAbleton/src/ofApp.cpp
commit so i can pull
Merge branch 'master' of https://github.com/sebleedelisle/interplay

Conflicts:
	MotionAbleton/bin/data/settings.xml
totally lame commit for data files so I can pull
Merge branch 'master' of https://github.com/sebleedelisle/interplay

Conflicts:
	MotionAbleton/bin/data/settings.xml
no reason
djsfk;
Merge branch 'master' of https://github.com/sebleedelisle/interplay

Conflicts:
	MotionAbleton/bin/data/settings.xml
screen grabs added