.iml-Dateien entfernt und .gitignore aktualisiert.
Merge branch 'network/chat' of ssh://git@github.com/hottehead/GameDevWeek.git into network/chat
add gitconfig
Merge branch 'dev_gameplay' into integration_test/network_gameplay

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/Game.java
Merge branch 'network/chat' into integration_test/network_gameplay
Merge branch 'network/lobby' into integration_test/network_gameplay
Merge branch 'master' into integration_test/network_gameplay
Merge branch 'integration_test/network_gameplay' into network/lobby