Testing Stuff

WOOOOOOOO
Merge remote-tracking branch 'origin/testBranch' into testBranch

Conflicts:
	src/websiteSuffix/companyName/handlers/ArtHandler.java