add .DS_Store to .gitignore
Merge branch 'master' of github.com:scbd/chm.cbd.int

Conflicts:
	.gitignore
do not specify scheme (i.e. http) in absolute urls