update ignore
Merge branch 'develop' of https://github.com/lawlietsun/comp3013 into develop

Conflicts:
	.gitignore