Merge pull request #3 from CSSS2013UrbanMobility/Juste's-branch

Juste's branch
Merge pull request #4 from CSSS2013UrbanMobility/Juste's-branch

added iris data
Adding public transport schedule
Added population density data
Merge pull request #5 from CSSS2013UrbanMobility/christoph's-branch

Added population density data
Update .gitignore
gitignore
Added photo of the white board after setting tasks
Merge branch 'master' of https://github.com/CSSS2013UrbanMobility/UrbanMobility into christoph's-branch
Merge pull request #7 from CSSS2013UrbanMobility/christoph's-branch

Christoph's branch
Delete .DS_Store
Update README.md
first draft of code for routing and move
conflict
Merge branch 'master' into Juste's-branch

Conflicts:
	Docs/formal/formalDescription.lyx~
doc
Merge branch 'Juste's-branch' of https://github.com/CSSS2013UrbanMobility/UrbanMobility into Juste's-branch