Merge pull request #7 from CSSS2013UrbanMobility/christoph's-branch

Christoph's branch
zyva !
zyva (bis)
Delete .DS_Store
Update README.md
first draft of code for routing and move
Delete README.md
model and doc
readme
Delete README.md
tried to solve conflict
conflict
Delete README.me
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
Merge branch 'Juste's-branch'
Create README.md
Merge branch 'master' into Juste's-branch
Model (Claire & Florent) with 1 type of breed

Zyva tsa mère, trop ouf Github