beautiful commit
angry commit
fixed
Merge remote-tracking branch 'origin/master' into fork1

Conflicts:
	Hallo/bin/uralchem/kckk/uit/FirstHallo.class
	Hallo/src/uralchem/kckk/uit/FirstHallo.java
Merge branch 'master' into fork1
Merge remote-tracking branch 'origin/fork1' into fork1

Conflicts:
	Hallo/bin/uralchem/kckk/uit/FirstHallo.class
	Hallo/src/uralchem/kckk/uit/FirstHallo.java