PUSHINGGGGGG

ALL THE THINGS
Merge branch 'master' of https://github.com/EECE281GroupAwesome/Projects

Conflicts:
	Code/Assembly/Project1/LCDlib.asm
	Code/Assembly/Project1/State Machine.hex
	Code/Assembly/Project1/State Machine.lst
	Code/Assembly/Project1/__a51.bat