quote
Merge branch 'master' of https://github.com/vexanie/git-dds

Conflicts:
	index.html
Merge branch 'master' of https://github.com/vexanie/git-dds

Conflicts:
	index.html