Commit before merge.
Merge branch 'master' of https://github.com/dkolkena/csrocc

Conflicts:
	myscript.sh