unimportant changes
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Scenes/Game.unity
Merge branch 'master' of https://github.com/Birdbrain2/Rougue

Conflicts:
	Assets/Scenes/Game.unity
merge with master
Merge pull request #78 from duiker2/master

put enemies back in