merge conflicts
ui work
added haml to gemfile
removed haml