db pushed
Merge branch 'master' of ssh://github.com/shanmugha/swc

Conflicts:
	database/school.sql