file change
Merge branch 'master' of https://github.com/luckicongee/2013.HOUSING

Conflicts:
	dev/content/properties.txt