added gitignore
Merge branch 'master' of https://github.com/vverhun/testpresentation6
local commit
trololo
Merge branch 'master' of https://github.com/vverhun/testpresentation6

Conflicts:
	java.txt