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:
  OSC control
  Nicer font
  Removed preset opacity on triangles.
  Larger window

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