Added some houses and started reworking camera controls
Merge branch 'master' of https://github.com/jockus/jockus.github.com

Conflicts:
	webgl-test/script.coffee
	webgl-test/script.js