checksumming
checksumming
Merge branch 'glen' of github.com:leejustin/CS118_2 into glen

Conflicts:
	sender.cpp