bla
Merge branch 'master' of https://github.com/Phelicks/Tryangle.git

Conflicts:
	Tryangle/src/com/januskopf/tryangle/level/Level3.java
	TryangleServer/src/com/januskopf/tryangleServer/Server.java
Added IntroBTriangle