partial refactor of router
Merge pull request #3 from Kereru2014Sharpies/darcy2

Darcy2
update switch, added return current choice method
usertotals module
Merge pull request #5 from Kereru2014Sharpies/karen

@Karen I love all the red squares
Merge pull request #4 from Kereru2014Sharpies/Team

Current team into master