Merge branch 'master' into Card-View
Add Haml to Gemfile for templating.
Change user/index to Haml.
Merge branch 'master' into view/user