commit
commit test
Merge branch 'master' of github.com:nao215/Zanryuchu

Conflicts:
	Resources/app.js