kot 1
Merge branch 'master' of
https://kkrystos@github.com/kkrystos/fast-git.git

Conflicts:
	fast/src/com/Test.java