renaming and cleaning
Merge branch 'master' of github.com:FTBpro/monte-cristo

Conflicts:
	README.md