bb
Merge branch 'master' of https://github.com/rubyonme/ximengla

Conflicts:
	www/js/app.js
	www/main.html