Merge pull request #4 from fnec/master

ogl3
premerge or poststash?
hollowkitty
hollowkitty2
wocka wocka wocka
harrisondeployscuttlefishcloak