Initial commit
vvff
Merge origin/master

Conflicts:
	README.md
Merge origin/master

Conflicts:
	README.md
javaapplication3
Merge origin/master

Conflicts:
	README.md
javaapplication3
Merge origin/master

Conflicts:
	README.md