update git ignore
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	.gitignore