jsf edited
Merge branch 'master' of https://github.com/summerz8/WeAreAce

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/summerz8/WeAreAce