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

Conflicts:
	the-site/HTMLPage.html
	the-site/Json_Manager.js
	wp-content/plugins/rot-plug/setpost.php
asd