Added HAML and HAML conversion
Converted erb files to haml and removed them
updates
merged feature/setup_haml branch
Added shoulda-matchers, exercise model spec.
Resolved merge conflict