resolved
Merge branch 'development' of https://github.com/theponti/Hello into development
Merge branch 'development' of https://github.com/theponti/Hello into development
Merge branch 'development' of https://github.com/theponti/Hello into development

aborts
non-changes in user.rb
fix merge conflict in user.rb
logout nav