test
changed README.md
Merge branch 'master' of https://github.com/mroskosch/ConInt

Conflicts:
	README.md