merging with patrick
Merge branch 'master' of github.com:dbkegley/AngryBernsteins

Conflicts:
	AngryBernsteins.jar