English content templates done
Merge branch 'master' of https://github.com/mb09/douwun

Conflicts:
	img/.DS_Store
ignore dsstore