Enemy Updates
Merge branch 'master' of https://github.com/endoearth/ggj2014

Conflicts:
	Assets/Scripts/PlayerControl.cs