update gitignore
sasha com
sasha com
Merge branch 'new2' into sasha

Conflicts:
	src/ua/art_code/test/TestMan.java