A better merge.
Merge branch 'master' of https://github.com/studentemag/blackjack.git
JUnit reports added