fixed merge conflict
added current_user helper, added more user routes
added nav_bar partial and included it in layout.erb, added generic index.erb message, updated user routes a bit
moved container div to layout
updated routes
Styled nav_bar, added name to db schema, added validations,
stuff

merge branch 'user_model'