conflicts
added confirmation email message displayed
deleted no useful puts from user controller
added confirmation email message
committing specs for voting
conflicts fixed
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
re positioned error form
form error message style fix
fixes
syles fixes