More changes to code
Merge branch 'dev' of https://github.com/rpow613/ECE372Lab1 into dev

Conflicts:
	lab1p1.c