wefaef
test
Merge branch 'feature/#3' of https://github.com/TeamBaron/test into
feature/#3

Conflicts:
	src/main/java/Test.java
Merge branch 'feature/#3' into develop