sth
Merge branch 'master' of https://github.com/athlan/picknplay-doc

Conflicts:
	Main.texnicle