Added window capabilities.
Merge branch 'master' of https://github.com/rhs9967/HauntedMansion

Conflicts:
	js/city.js
	js/loader.js