Merge branch 'matt'

Conflicts:
	test1.c
Merge branch 'master' of https://github.com/mattmarquard/310assign1