LOOKS LIKE MENU IS ON THE MENU TONIGHT, BOYS!
Merge branch 'master' of https://github.com/tie372/funkyPixels

Conflicts:
	main.lua
MENU IS TRIPPIN; BANDAID FOR DAT PUFFER; BAN THAT SICK FILTH;