commit and revert

hope this works
Revert "commit and revert"

This reverts commit cd48ff497b653010f77e76988ed14955593998a3.
commit to pull
Merge branch 'master' of https://github.com/ktho/gg

Conflicts:
	ggdb.sql