Mod1 End of Week 1 Pull Request

That helps. I think I still need to spend more time on haml and bootstrap forms.