Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/lakers

Conflicts:
	include/gui/gbframe.h
Connects sql and gui
Merge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/lakers