added linkedin gem
added devise
fixed merge conflict