Merge branch 'christoph's-branch'
Merge branch 'master' into christoph's-branch
load-network in include-file
Merge branch 'christoph's-branch'
Merge pull request #11 from CSSS2013UrbanMobility/christoph's-branch

Christoph's branch
Merge pull request #12 from CSSS2013UrbanMobility/juste

Juste
set colours for the transit lines, added length field for transit and road segments
set colours for the transit lines, added length field for transit and road segments, no. 2
Merge branch 'master' into christoph's-branch
Merge branch 'christoph's-branch'
Merge branch 'master' of https://github.com/CSSS2013UrbanMobility/UrbanMobility into christoph's-branch
Merge branch 'christoph's-branch'
Delete UrbanMobility.nlogo
Merge branch 'master' into christoph's-branch
 ...