Merge pull request #1 from depinav/development

Development
updating the controller test message
Basic routing in place
Merge branch 'master' into development