solve renamed
Merge branch 'master' of
https://rosoba@github.com/simvisage/oricrete.git

Conflicts:
	oricrete/folding2/folding.py