Additional files

Additional files
Merge branch 'master' of github.com:ceefour/gitattributes

Conflicts:
	Common.gitattributes
	Web.gitattributes