Integrated user model
Added sign up
Merge branch 'model_integration'
Merge branch 'master' of https://github.com/ariel-cossio/pics

Conflicts:
	app/app.rb