not sure what I did here, probably just formatting
Merge branch 'master' of https://github.com/bhanderson/cpts360

Conflicts:
	project/ext2.c