haml fix
Merge branch 'Klopsch'
Merge branch 'master' of github.com:Klopsch/finalproject
Build initial homepage
Built homepage
Merge branch 'master', remote-tracking branch 'origin' into Klopsch
Add happy@fake.com as a user to seed.rb
Merge branch 'master' of https://github.com/Klopsch/finalproject
Merge branch 'master', remote-tracking branch 'origin' into lacoste
passing cucumber tests