Fixed makefile error
Huge rewrite
New scene model working, valgrind complains a bit but seems inoffensive.
Merge pull request #16 from Lulker/collision

Scenes added.
Manual merge