,khjl
Merge branch 'master' of https://github.com/eyanai/rot-cube

Conflicts:
	the-site/Json_Manager.js