bombing buildings
Merge branch 'master' of github.com:kwahu/hats

Conflicts:
	hats.userprefs