-updated grid design
Merge branch 'master' of https://github.com/vikaspaturi/school_mgmt_git

Conflicts:
	js/common.js