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

Conflicts:
	TryangleServer/src/com/januskopf/tryangleServer/GameObjects.java
Moved addAnimation Method to TriangleContainer