Updated gemfile to include pry
Updated erbs to haml
Merge and Fix Conflicts