more castling stuff
fixing merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	test-output/Default suite/Default test.html
	test-output/Default suite/Default test.xml
	test-output/emailable-report.html
	test-output/index.html
	test-output/junitreports/TEST-game.TestNG.xml
	test-output/old/Default suite/methods-alphabetical.html
	test-output/old/Default suite/methods.html
	test-output/testng-results.xml