merge local changes
Merge branch 'master' of https://github.com/vulpineblaze/aegis_hael

Conflicts:
	js_source/lib/game/entities/guard.js
	js_source/lib/game/entities/tower.js
	js_source/lib/game/levels/intro.js
after the merge