Type merge test
Merge branch 'master' of ssh://github.com/ColtonPhillips/seng480a-assignment1

Conflicts:
	Verifier.c