Added new enemy types
FIxed a conflict
Merge branch 'master' of https://github.com/aisopuro/DigiMedia

Conflicts:
	beatblaster/js/enemyfactory.js