version2
Merge branch 'master' of https://github.com/robertjordanebdalin/trytry

Conflicts:
	java.txt