update
Merge branch 'master' of https://github.com/vikaspaturi/school_mgmt_git

Conflicts:
	application/views/chat.php