add comment to my first branch
add comment to my first branch
Merge remote-tracking branch 'origin/my_first_branch'

Conflicts:
	src/ru/stn/IconChooserPane.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ru/stn/IconChooserPane.java