lots
Merge branch 'master' of https://github.com/sevagsatamian/platformer

Conflicts:
	public_html/js/entities/entities.js