everything tested
Merge branch 'master' of github.com:srpunjabi/blackjack

  Need to update file names in Views#