Basic ennemies
deleted:    GGJ_2014.userprefs
Merge branch 'master' of github.com:Khoyo/GGJ_2014

Conflicts:
	GGJ_2014.userprefs