sync
Wall lagaður
Merge branch 'wall' of github.com:kreldjarn/TRON into wall

Conflicts:
	scripts/entityManager.js
Stash
Broken