Stash before merge
Merge branch 'master' of github.com:kreldjarn/TRON

Conflicts:
	scripts/Player.js