restart sampling
Merge branch 'master' of https://github.com/ChrisSSanford/ECE372-Lab3

Conflicts:
	lab3.c
Merge branch 'master' of https://github.com/ChrisSSanford/ECE372-Lab3

Conflicts:
	lab3.c
Merge branch 'master' of https://github.com/ChrisSSanford/ECE372-Lab3 into rachdev

Conflicts:
	lab3.c