Merge branch 'master' of http://github.com/kokx/tue-2io23
Merge branch 'master' of http://github.com/kokx/tue-2io23
Merge branch 'master' of http://github.com/kokx/tue-2io23
a
Merge branch 'master' of http://github.com/kokx/tue-2io23
Merge branch 'master' of http://github.com/kokx/tue-2io23
Merge branch 'master' of http://github.com/kokx/tue-2io23
Added IntelliJ ProjectFiles to .gitignore.
Added .gitattributes to normalize line endings. Updated IntelliJ ProjectFiles in .gitignore.
Added SoundInput.java. Monitoring sound level from a microphone works!
Renamed SoundInput to SoundMonitor. Refactored SoundMonitor.
Added closing of game after failing/closed connection
Merge branch 'master' of git://github.com/Alchiadus/tue-2io23

Conflicts:
	src/ogo/spec/game/graphics/view/CreatureView.java
	src/ogo/spec/game/graphics/view/GUI.java
Merge branch 'master' of git://github.com/maikelsteneker/tue-2io23

Conflicts:
	src/ogo/spec/game/graphics/view/GUI.java
Merge branch 'master' of git://github.com/FlorianOosterhof/tue-2io23
Nasty way to change angle of creature.
Merge branch 'master' of https://github.com/kokx/tue-2io23.git

Conflicts:
	src/ogo/spec/game/graphics/view/CreatureView.java
	src/ogo/spec/game/graphics/view/GUI.java
Merge pull request #23 from Loct/master

Added angle movement
Merge branch 'master' of git://github.com/maikelsteneker/tue-2io23

Conflicts:
	src/ogo/spec/game/graphics/models/food.obj
	src/ogo/spec/game/graphics/view/GUI.java
jan