- git ignore update
git ignore result
ignore update
git ignore update
Merge branch 'master' of https://github.com/wjswjs2/project.WeMakeGenius

Conflicts:
	.classpath
	.gitignore
	.project
Merge branch 'develop'

Conflicts:
	.classpath