deleted:    new-pages/.DS_Store
Merge branch 'master' of github.com:pw374/sandbox-ocaml.org

Conflicts:
	new-pages/.DS_Store
	deleted:    new-pages/.DS_Store