...
Merge branch 'master' of http://github.com/tigerpash/trafiksim

Conflicts:
	Makefile
Merge branch 'master' of http://github.com/tigerpash/trafiksim