Merge branch 'allen'
adding setUpRoute
Merge branch 'master' into allen