geo, babay!

hi.
Merge branch 'master' of https://github.com/p-stav/goOut

Conflicts:
	goOut/dev.sqlite3

unselected pyc conflict files.
foo bar

hi