same page sync
same page sync
same page sync
fixed merge conflicts
Merge branch 'master' into kristin
Merge branch 'master' into kirk
changed date time stuff
do not use this commit
made mistake
made mistake kristin pull this down
changed placeholders and headers in booking_sidebar_html.erb
still adjusting css
kirk
clean gemlock file without windows added dependancies
Merge branch 'kirk' of https://github.com/CodeCloudMe/gathsybeta into kirk
removed windows based gems in gemfile lock, so heroku doesn't remove the file
customized css for responsive in header, spaces, root and application css files
removed windows gemlock lines
tweaked styles in spaces.css.scss
tweaked styles in spaces.css.scss