comment
Merge branch 'master' of https://github.com/travtex/codeup.dev

Conflicts:
	public/js/blackjack.js