changes to users
working current_user
Merge pull request #34 from lizrush/layout

Layout
merge master into show layouts