- added psmove functionality to paint only on trigger push and to pick
colors from the color slots with the square button
- color of the move bulb changes when picking a color
Merge pull request #13 from tugelbend/develop

- added psmove functionality to paint only on trigger push and to pick
- make mouse work when psmove is not connected
- added the colorpicker and the colorslots to the menu
- circle button on the psmove now opens the menu
Merge branch 'develop' of
https://github.com/GraffitiResearchLabGermany/bombIR.git into develop

Conflicts:
	Code/bombIR/spraypaint.pde
- clearing screens now working
colorpicker is now working correctly

the colopicker was picking the wrong color if something has been drawn.
this has been fixed.
Merge branch 'develop' of https://github.com/tugelbend/bombIR into develop

Conflicts:
	Code/bombIR/spraypaint.pde
added cornerpinsurface to background for calibration

the background can now be calibrated using the keystone lib.
Merge with tugelblend-develop
Merge pull request #16 from tugelbend/develop

added cornerpinsurface to background for calibration
settings.properties for configuration
Merge pull request #17 from tugelbend/develop

settings.properties for configuration
bug fix: background image to wide
Merge pull request #18 from tugelbend/develop

bug fix: background image too wide
Merge pull request #1 from GraffitiResearchLabGermany/develop

Getting Hauke's Latest
Merge pull request #2 from GraffitiResearchLabGermany/master

Getting Raf's Spray
Merge branch 'develop' of https://github.com/tugelbend/bombIR into tugelbend-develop

Conflicts:
	Code/bombIR/keystone.pde
	Code/bombIR/spraypaint.pde
Merge remote-tracking branch 'refs/remotes/origin/master'
Adding psmove Processing library
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Conflicts:
	Code/bombIR/keystone.pde