fixed logout rspec
fix merge conflicts Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
pulling fog.init fileMerge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
add map to stylist show page viewed by client including salon marker
right margin fixed
Coffeescript to add hide to the form
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
add salons to seed file to show link between client and stylist salon
reseedMerge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
login styled cancel added
I don't even remember why
Video hover on stylist page works
Stupid merge errros
Stupid coffe script stuff
More stupid coffeescript stuff
about to try some crazy shit on the stylist show pg
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
dashboard and gallery changes
dashboard and gallery changes