s
Merge branch 'master' of git://github.com/davidmarcano/CS323-PS1

Conflicts:
	nfind
	nfind.o
passing 15/18 tests