Merging
Merge branch 'master' of https://github.com/tomtwo/amnesia

Conflicts:
	www/blackjack/DefaultMain.js
	www/blackjack/GameManager.js