Fix test
Add Athena to the Cross Crusade overall
Merge branch 'master' of github.com:scottwillson/racing_on_rails into mbra-bar
Add all the MBRA BAR rules
Move MBRA BAT to Calculator