Merge pull request #12 from GraffitiResearchLabGermany/develop

Develop --> Master (for sake of easier merges later, not b/c there's anything super important)
Merge pull request #1 from GraffitiResearchLabGermany/develop

Getting Hauke's Latest
Merge pull request #19 from SableRaf/master

Faster spray simulation + image based dispersion
Merge pull request #20 from SableRaf/master

Spray angle prototype
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'
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Conflicts:
	Code/bombIR/keystone.pde
moved Seoul code into bombIR directory
trying to get camera thread to work
Merge pull request #23 from SableRaf/develop

Putting psmove lib in the right folder
Merge branch 'develop' of https://github.com/JesseScott/bombIR into JesseScott-develop