merge
no message
Merge branch 'master' of https://github.com/rit-somethings-wrong/somethings-wrong

Conflicts:
	SomethingsWrong/SomethingsWrong/chat.js