edited lab2

lab2 edit
unsure

unsure
Merge remote-tracking branch 'origin/mergeTest'

Conflicts:
	Lab1/src/main.c