just for lolz
stuff
Merge branch 'jowc' into HEAD

Conflicts:
	data/std.inc.php
Merge pull request #28 from wvanderp/jowc

Jowc