Manual merge with changes from 0.2.food
Renamed README
Tested to perfection
Tested
Merge branch '0.2.eat' into 0.2

Conflicts:
	environment.py