-Finalize db
Merge branch 'master' of github.com:crymaster/OnlineBusTicket

Conflicts:
	script.sql