Debug Defines
Merge branch 'master' of https://github.com/SpexGuy/Micro2048

Conflicts:
	Dist/p1/ece353_base_project.uvopt
	Dist/p1/main.c