creating feature_1 branch
edit ignore file
added feature one file to project
suo
ignore suo
Merge branch 'feature_1'

Conflicts:
	.gitignore
	appOne/appOne.v11.suo