not done
Merge branch 'master' of https://github.com/strivedi183/snippyskippy
add user model spec file
Added jquery mobile 1.3.0 to vendor/assets/download
welcome ctrl and view
testing plugin
Merge branch 'master' of https://github.com/strivedi183/snippyskippy
Adding up the models and the db migration files
Made changes
add factories, features and models spec files
Sorry for being an idoit
fix merge conflicts
fix merge conflicts
fix merge conflicts
Added user model methods
add validation
add validation
Added geocoder gem and model functions in the salon and client models
styling and welcome index
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev