Triangles
Merge branch 'master' of https://github.com/HalfdanJ/Obscura-RF2013

# By Johan Bichel Lindegaard
# Via Johan Bichel Lindegaard
* 'master' of https://github.com/HalfdanJ/Obscura-RF2013:
  Added a new scene
  Removed msg cout
  Improved OSC receiver.
Triangles showoff
Merge branch 'master' of https://github.com/HalfdanJ/Obscura-RF2013

# By Johan Bichel Lindegaard
# Via Johan Bichel Lindegaard
* 'master' of https://github.com/HalfdanJ/Obscura-RF2013:
  New Mapping
Merge branch 'master' of https://github.com/HalfdanJ/Obscura-RF2013

# By Johan Bichel Lindegaard
# Via Johan Bichel Lindegaard
* 'master' of https://github.com/HalfdanJ/Obscura-RF2013:
  Now uses the new.
  ignore
  Ignore settings
syphon discovery
Merge branch 'master' of https://github.com/HalfdanJ/Obscura-RF2013

# By Johan Bichel Lindegaard (1) and Obscura (1)
# Via Johan Bichel Lindegaard (1) and Obscura (1)
* 'master' of https://github.com/HalfdanJ/Obscura-RF2013:
  gl smooth
  New scene.

Conflicts:
	Gloria/src/Triangles.cpp
	Gloria/src/testApp.cpp
Triangles