codecoin
Merge branch 'master' of https://github.com/zpeyton/codechat

Conflicts:
	index.php