Game controls Other Game
uvproj
uvproj
Merge branch 'master' of https://github.com/SpexGuy/Micro2048

Conflicts:
	Dist/p1/2048.crf
	Dist/p1/2048.o
	Dist/p1/ai2048.crf
	Dist/p1/ai2048.o
	Dist/p1/animation.crf
	Dist/p1/animation.o
	Dist/p1/communication.c
	Dist/p1/communication.crf
	Dist/p1/communication.o
	Dist/p1/doublebuffer.crf
	Dist/p1/doublebuffer.o
	Dist/p1/ece353_base_project.axf
	Dist/p1/ece353_base_project.htm
	Dist/p1/ece353_base_project.map
	Dist/p1/ece353_base_project.uvopt
	Dist/p1/ece353_base_project_base_project.dep
	Dist/p1/eeprom.crf
	Dist/p1/eeprom.o
	Dist/p1/hw4_adc.crf
	Dist/p1/hw4_adc.o
	Dist/p1/hw4_gpio.crf
	Dist/p1/hw4_gpio.o
	Dist/p1/initboard.crf
	Dist/p1/initboard.o
	Dist/p1/led_chars.o
	Dist/p1/lock.crf
	Dist/p1/lock.o
	Dist/p1/main.c
	Dist/p1/main.crf
	Dist/p1/main.o
	Dist/p1/pixel.crf
	Dist/p1/pixel.o
	Dist/p1/renderer.crf
	Dist/p1/renderer.o
	Dist/p1/screen.crf
	Dist/p1/screen.o
	Dist/p1/spi.crf
	Dist/p1/spi.o
	Dist/p1/systick.crf
	Dist/p1/systick.o
	Dist/p1/timer.crf
	Dist/p1/timer.o
	Dist/p1/uart.crf
	Dist/p1/uart.o