git change
git change
git change
Merge branch 'master' of https://github.com/Justin-wei/project

Conflicts:
	.gitignore
Merge pull request #1 from Justin-wei/master

push code to develop