organized services offered, schedule your visit, find us section; began scheduling form
Merge remote-tracking branch 'origin/master' into site-layout
Merge remote-tracking branch 'origin/master' into site-layout
started work on schedule your visit section
started working on Schedule Your Visit section
fixed conflict - nothing deleted
renames image id's, moves candlezz to just above feedback
fixed to schedule your visit forms
fixed html and css according to conflicts
fixes double logo conflict
adds margin to top of candlezz, fixes overlap between candlezz and map
added dropdown menu template (still needs text change to reflect services), added text area (optional edit - add placeholder 'comments' inside)
Merge branch 'new_branch_name' into site-layout
more changes to schedule your visit section
changed links in Choose Massage Type
fixed conflicts
moves blocks around using bootstrap grid system
is fixes merge even a good commit message?
Merge branch 'site-layout'