validation on users
model?
Merge branch 'master' of https://github.com/blklane/amplifyuwebsite

merging of spree and prelim. front end work
Added devise (login system to rails app)