Fixed page routing problem
Merge branch 'master' of https://github.com/drubio1989/kickball_dan