Merge branch 'master' of https://github.com/csontos/bfh-java-project-class-2o

Conflicts:
	src/ABR.java
	src/SSL.java
Revert "Merge branch 'master' of https://github.com/csontos/bfh-java-project-class-2o"

This reverts commit e0996089a8a7453a7043d79771c24ee433176098.
Merge
Merge