Fixed problems with Maps
dsgf
Merge branch 'master' of github.com:soapy1/stream-loan
Fixed maps and tab views
fixed errors and stuff
Merge branch 'master' of github.com:soapy1/stream-loan
dolla dolla billz
Merge branch 'master' of https://github.com/soapy1/stream-loan

Conflicts:
	main.py
Merge branch 'master' of github.com:soapy1/stream-loan