fix signed in and 'services' bug
fix user update/edit bug
Edit images css
updated
merge

Merge branch 'master' of https://github.com/TherapyLane/Rub_Me
merge files
Fix services and description
add ruby to gemfile
add vendor/bundle to gitignore
remove extra images
add background color to topbar
add new image files
merge
Merge branch 'master' of https://github.com/TherapyLane/Rub_Me
adds rgba and background image
Add services and description
Edit devise conflicts
adjust layout styling for results page and footer
fix bug in application.rb config file
Add d to the word end
Merge branch 'master' of https://github.com/TherapyLane/Rub_Me into karinn

merge