1 class
2 class
bug1 - 3 class
bug2 - 4 class
bug2 - 3 class - edit
bug4 - 1 class - edit
Merge branch 'bug2'

Conflicts:
	src/test/java/ru/twelveyes/git/Bug1Third.java
r1
r2
r2 - edit
test1
test3
test2
Merge remote-tracking branch 'origin/master'
test3