Trying out new Unity settings
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014
Merge pull request #6 from floorman/master

Hopefully this will fix things