Navigation styling
Merge branch 'master' of https://github.com/andou/node-car.git

Conflicts:
	views/colour.jade