Merge pull request #60 from Kierz/master

rewrote scrubbing code
Fixed all warning messeges and made most of code more floorman approved as well as improving the end of round scene, also added an aspect manager so the main screen renders fine regardless of resolution
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014