install devise
resolved merge conflict in routes
Merge pull request #7 from acltc/devise

Devise