Changes to be committed:
	deleted:    gainfreedom
modified:   preprocessor/preprocessor.go
	modified:   server/server.go
	modified:   start.go
Merge branch 'master' of https://github.com/spyrefused/gainfreedom

Conflicts:
	server/server.go

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   preprocessor/subdomain.go
	modified:   server/server.go
 Changes to be committed:
	new file:   gainfreedom.log
	modified:   preprocessor/preprocessor.go
	modified:   server/server.go
	modified:   start.go