gnote
Merge branch 'master' of github.com:Thywin/Thywin
Formatting adjusted
Merge branch 'master' of github.com:Thywin/Thywin

Conflicts:
	source/crawler/happyhttp.cpp
	source/crawler/happyhttp.h
	source/crawler/main.cpp
Formatting