Updating house tax site
Merge branch 'master' of https://github.com/simmons-tech/Simmons-Website

Conflicts:
	static/housetax2014/index.html
Merge pull request #52 from lrsjohnson/master

Updating house tax slides and adding text