second commit - correct this time
test
another attempt...
Merge branch 'master' of https://github.com/bbeaird/type_racer_garreth_vanessa_tyler_brantley
another attempt....