resolve conflict in devise.rb file
Merge branch 'develop' of https://github.com/kumar-adventure/720coaching into develop
add secrete key in devise.rb
quick fix