Signed-off-by: hmf <hugo6ferreira@gmail.com>
Merge branch 'topic1' into topic2

Conflicts:
	git_train/src/or/git_train/pack1/Class1.java

Signed-off-by: hmf <hugo6ferreira@gmail.com>