Merge controllers to one file
Merge branch 'master' of github.com:Cobra-Kao/synckr