progress with round results
Merge branch 'master' of https://github.com/mattse/cameraTag
working routes and nav bar
Merge branch 'master' of https://github.com/mattse/cameraTag
set timer back to 5 minutes