transfer1
Merge branch 'master' of https://github.com/amos32/garbage

Conflicts:
	Nziguratt.cpp
transfered
zeroed
regen
shit
bullshit
transfer
transfer again