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

Conflicts:
	js/inside.js