adding_devise
Merge branch 'adding-devise'