setup, not tested yet!
SETUP
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project 1/src/oven/driver.asm
	Project 1/src/project1.asm
	Project 1/src/setup.asm
	Project 1/src/util/LCD.asm