some quick fixes

so we don’t lose more fahkin code
Merge branch 'master' of https://github.com/p-stav/goOut

Conflicts:
	goOut/dev.sqlite3