edit
Merge branch 'master' of https://github.com/plrin/projektc

Conflicts:
	README.md