ignore
Merge branch 'master' of https://github.com/zakazai/ceteor

Conflicts:
	index.php