6th change

jellybeans
Merged

Conflicts:
	controllers/default.py
	progress.log