"merge"
Merge branch 'master' of github.com:vtmike14/escape
"merge"
Conflicts:
	house.py
Merge branch 'master' of github.com:vtmike14/escape
Merge branch 'master' of github.com:vtmike14/escape
"merge"

Conflicts:
	house.py
Merge conflict
Finished product