Merge branch 'master' of https://github.com/donsalari/codenameDS

Conflicts:
	index.html
new
Merge branch 'master' of https://github.com/donsalari/codenameDS

Conflicts:
	index.html