bundled the app
resolved conflicts in Gemfile.lock
added haml gem
converted erb to haml
Merge branch 'develop' of github.com:vparihar01/hippo into develop