HAML installed and working in application.html.haml and welcome#index.html.haml
Merge branches 'master' and 'creating-views'