test
Merge branch 'master' of ssh://git@github.com/Graam94/Brutal-Tiger.git

Conflicts:
	src/main/Main.java