readme
Merge branch 'master' of https://github.com/vedard/Cube

Conflicts:
	README.org