backend fixed
Merge branch 'master' of https://github.com/ahleow200/OnlineBusSystem

Conflicts:
	OnlineBusSystem2/OnlineBusSystem2.pro
	OnlineBusSystem2/mainwindow.cpp
	OnlineBusSystem2/mainwindow.h
solved conflict