change gitignore to ingore png
Merge branch 'master' of https://github.com/ylwu/869-final

Conflicts:
	.gitignore