Merge pull request #17 from nairys/trigger_finder

not working
did the things
Merge pull request #18 from nairys/rant_mvc

did the things
adds edit user
Merge branch 'master' into trigger_finder