update controllers
ngigngerge branch 'master' of https://github.com/TinyHook/noteTakingAppNo