@narmo screenshots
Merge branch 'master' of github.com:Narmo/code-screenshots into Narmo-master

Conflicts:
	README.md
Merge branch 'Narmo-master'