merge
Merge branch 'master' of https://github.com/m-tu/ftcg

Conflicts:
	app.js