del the .project from .gitignore
del erro js
Merge branch 'master' of https://github.com/zhanyd/Football.git

Conflicts:
	.gitignore
1