Merge branch 'use_devise'
Merge branch 'master' of https://github.com/solowolf21/demap