Test 2
bah
Merge branch 'beta' of https://github.com/Kanel/AllThemPixels into beta

Conflicts:
	All Them Pixels/All Them Pixels/main.cpp