fix
Merge branch 'master' of github.com:s9gf4ult/projs

Conflicts:
	metatea.org
fix