go
Merge branch 'master' of https://github.com/illrestart/fantasy

Conflicts:
	tmp.cpp