Merging with upstream
Merge branch 'master' of https://github.com/cicadas-2014/BJR into kevin/login
WIP on controller tests
Fixed merge conflict in user spec
WIP on controller tests
Merge branch 'master' of https://github.com/cicadas-2014/BJR into kevin/login
Finished User controller tests
Removed sass
Fixed current controller and feature tests
Removed index path. Only use root path now.
Added winner field to round model. Added methods to round model to set the winner and payout based on racer stats.
Fixed bug in round controller test
Passed all current tests. Created 2 pending tests for when the race is over.
Merge pull request #29 from kz363/kevin/login

Kevin/login