Edit Therapists results view
Add merge conflict changes
fix conflict
Fix show conflict
Edit layout
Change layout
Merge branch 'master' of https://github.com/TherapyLane/Rub_Me into karinn

it.
merge
add nav bar text box
Add fb/twitter and twitter handles
Merge remote-tracking branch 'project/karinn'

merge latest changes
Edit colors for footer
Remove black box from nav bar
Add secondary nav bar
Add therapist logic to links
add client view of calendar
Edit footer width
Merge branch 'karinn' of https://github.com/TherapyLane/Rub_Me

merge
add client calendar to therapist show page