reset hard back to commit before errors started when switching while still running rails s now merged in latest kirk branch gemlock fixed now
reset hard back to commit before errors started when switching while still running rails s now merged in latest kirk branch gemlock fixed now
Merge branch 'kirk'
fixed gemfile.lock for heroku push
Merge branch 'kirk'
Merge branch 'kirk'
updated margin on main column during mobile
Merge branch 'kirk'
Merge branch 'kirk'
Merge branch 'kirk'
removed ming in gemfile.lock
Merge branch 'kirk'
add mailers
adding mailers
edited emailer.rb and bookings_controller.rb
edited emailer.rb and bookings_controller.rb
edited emailer.rb and bookings_controller.rb
edited emailer.rb and bookings_controller.rb
edited emailer.rb and bookings_controller.rb
added alert to jpaypalcart.js