add ignore file
Merge branch 'master' of //192.168.1.130/vss_data/GitRepository/General

Conflicts:
	.gitignore
fix General project