Merge branch 'master' of https://github.com/elliotanderson13/syllasharefinal

Conflicts:
	chat.php
	sendchat.php
Bull try
Finally