updated pages to tie into gui class
Merge branch 'Development' of https://github.com/MSU-CS-Software-Engineering/habitgame into Development

Conflicts:
	engine.py