added devise to gem file and tells devise to use User model
 adds in devise to our layout _application file
User now has to login before accessing app adds Gem html2haml
change erb to haml
resolve merge conflict