lol
Merge branch 'master' of https://github.com/danqiye1/ECE4760

Conflicts:
	lab2/Sample/.DS_Store
	lab2/old_version/lab2.c