stuff
Merge branch 'master' of https://github.com/rbryan/petulant-tribble

Conflicts:
	Makefile
	main.c
	thirdparty/md5/md5.o
	thirdparty/sha1-c/sha1.o