Updated controllers
Merge pull request #19 from avyishi/collaborators

Updated controllers