STUFF
Merge branch 'proj3' of https://github.com/FindlayFaubion/EE472.git into proj3

Conflicts:
	functions.c
	functions.h