.gitignore changed
Merge branch 'demo'

Conflicts:
	.gitignore
fixed merge conflict
merged sha-post
fixed merge conflict
fixed duplicate values