bug fixed
Merge branch 'master' of https://github.com/projectws/MiserY

Conflicts:
	Hex.py
no message