readme
Merge branch 'master' of https://github.com/dordika/dordika.github.io

Conflicts:
	Readme.md