problem 1000
Merge branch 'master' of https://github.com/bekfri/ACMTimus

Conflicts:
	1000/src/pkg1000/Main.java