Added Class for Ship (player)
Added Dictionary for ennemies
Merge branch 'master' into develop

Conflicts:
	index.html