add map and salon markers to stylist index page
added a map to index page
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
Added colorbox jquery plugin and gem and integrated it to the gallery show page as well as a as added a medium layout page
nav fixed, started edit user ps
sidebar added
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
Got the polling working
new fave icon
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
Resolved conflicts
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
Got polling working
show page starting to look good
merge
pull
add gritter notifications, twilio text msg and ses e-mail notification on registration
merge conflict in app helper
poll index and got rid of user dashboard
fu