Merge pull request #62 from wroy/master

locking down cannon on pause
Infinite random queue
git mergetool, expect errors
Adding extra materials for comparisson
Merge pull request #64 from mkirk8/master

Adding extra materials for comparisson
I'm going to learn how to merge
Merge branch 'master' of https://github.com/TeamTriangular/Triangular
hopefully we merged
Final merge of random level bugs
Merge pull request #65 from Gerb11/master

Git merge successful, WOOOOOO
changed distance from camera
Merge pull request #66 from JeremyKooper/master

changed distance from camera
adding game over script