converted erb to haml, added gems, minor frontend changes
Merge branch 'master' of github.com:encorelab/hampshire-web

Conflicts:
	Gemfile