COmmit before merge
Merge branch 'master' of https://github.com/stacksBundles/geoSports

Conflicts:
	collabitBase.db
	directory/views.py
Merge branch 'master' of https://github.com/stacksBundles/geoSports

Conflicts:
	collabitBase.db
merge