More game stuff
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros
Oscillation of the y position of the triggers now implemented.
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros

Conflicts:
	PixelPyros/src/ofApp.h