Triangles og en masse små forbedringer
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:
  Indent
  Name change.

Conflicts:
	Gloria/src/mapping.h