add devise gem and controller home.
add annotate gem
deleted a comment
conflicts resolved