Updated the README, created a new route file.
Fixed some conflicts.

Merge branch 'master' of https://github.com/michielpauw/Heuristics

Conflicts:
	Matrix/route.py
	Matrix/route.pyc