add haml
update
Merge branch 'gh-pages' of https://github.com/YishanHuang/FinalProject into gh-pages

Conflicts:
	css/style.css
	index.html