All now working
fix g
Merge branch 'master' of github.com:fizzfaldt/cse638-hw

Conflicts:
	hw1/Makefile