syso
modified main in iss53 branch
modified main in hotfix
main modified in b
Merge branch 'b'

Conflicts:
	Project1/src/console/Main.java
added in master
1
1
2
After first change in "topic":
After second change in "topic":
added to ch2 in topic
added to ch2 in master
Merge branch 'master' into topic

Conflicts:
	Project1/chapter2
topic added jap in ch1
ch3 added
ch4
ch3
Merge branch 'ch4' into ch3
ammend ch3