LOAD ALL THE THINGS;
Merge branch 'master' of https://github.com/tie372/funkyPixels

Conflicts:
	main.lua
Merge branch 'master' of https://github.com/tie372/funkyPixels

Conflicts:
	main.lua