change controllers
Merge branch 'master' of github.com:afast/hackathon