Small Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tryangle/src/com/januskopf/tryangle/Tryangle.java
	Tryangle/src/com/januskopf/tryangle/level/Level3.java