updated some markdown
Merge branch 'master' of https://github.com/nadgerz/satoyma

Conflicts:
	doc/links.md