Step changes
Merge branch 'James-Feature-Branch' of https://github.com/spokkal/CookWithMe into James-Feature-Branch

Conflicts:
	dbInteface.pyc
	ingredient_state.pyc
	instruction_state.py
	instruction_state.pyc
	intro_state.pyc
	state_machine.pyc
	text_processing.pyc