First commit
Merge branch 'master' of https://github.com/corosuske/cid-support

Conflicts:
	.gitignore
	modified:   .gitignore
	modified:   README.md
	modified:   mylog
	modified:   run.sh
	modified:   updatejava.sh
	modified:   updatescript.sh
	modified:   versionnr.txt