added devise
Merge branch 'master' of https://github.com/fanyin/cis196-hw