left menu
Merge branch 'master' of github.com:Monnoroch/Ya.Bay

Conflicts:
	www/css/index.css
	www/index.html
	www/js/index.js
Merge branch 'master' of github.com:Monnoroch/Ya.Bay