Changed the title to Robotron
Fixed a typo
few changes on protagonist, more cates on entity
redid oddur's fix on type (was correct)
Merge branch 'master' into enemies-ernir

Sameining á fídusum frá Erni og Jianfei

Conflicts:
	managers/entityManager.js