nav
Merge branch 'master' of github.com:xirukitepe/obra
git status
fixed conflicts
Merge branch 'master' of github.com:xirukitepe/obra
devise