Bryce

new 0047
Merge branch 'master' of https://github.com/mmackay03/war

Conflicts:
	blackjack/default.css