Devon's push
Devon's push
tryign to push again
Final merge
Finished version!
Merge branch 'devonsbranch'

Conflicts:
	main.c
	makefile