merge
merge
Ovinur sem eltir
Haegt ad fara upp um bord og deyja
small changes to plyReader
started refactoring enemies
Merge branch 'master' of github.com:Tritlo/Tebert
model now uses colors for cache
fixed enemy movement bug
Merge branch 'master' into RefactorEnemies

Conflicts:
	Ball.js
	Pyramid.js
	Snake.js
some logging removed
Merge branch 'master' into gh-pages