removed *.userprefs
fixed prefabs and scene
fixed .gitignore
Merge branch 'enemy-generation'
Merge branch 'master' of github.com:holycattle/timehack