Merge pull request #39 from mLuby/master

test coverage for MasterController.js