Merge branch 'master' of https://github.com/Ricain/CoEtu

Conflicts:
	index.php
index change
change index