added devise gem
added user and admin models
added error messages to application layout
fixe merge conflict