log4j added
config file added
before maven commit
commands moved
time printing
working on collisions / overtake animation
Merge remote-tracking branch 'origin/master' into master-mischa
Merge remote-tracking branch 'origin/master-mischa'

Conflicts:
	src/main/java/ch/bfh/ti/jts/App.java
	src/main/java/ch/bfh/ti/jts/data/Lane.java
	src/main/java/ch/bfh/ti/jts/gui/Window.java
	src/main/java/ch/bfh/ti/jts/gui/console/BasicConsole.java
	src/main/java/ch/bfh/ti/jts/gui/console/Console.java
	src/main/java/ch/bfh/ti/jts/gui/console/JtsConsole.java