Rebranch repo
Merge branch 'master' of https://github.com/louis77/gophd

Conflicts:
	gophermap.c
	main.c
	types.c
	types.h