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

Conflicts:
	.classpath
	.gitignore
	.project