playerCouter,
Merge branch 'master' of https://github.com/mimirerelala/Dairou

Conflicts:
	Letterpress.js.rar
	Letterpress.js/scripts/event-listeners.js
	Letterpress.js/scripts/main.js
Merge remote-tracking branch 'origin/master'