do not track private files
comment .gitignore
Merge branch 'dev' into mark

Conflicts:
	.gitignore