changes to controllers
Merge pull request #18 from chiswilson/master

changes to controllers
added devise
Merge pull request #19 from R1V3R5/master

added devise
merge conflict