New design and more routes
Merge branch 'master' of github.com:mlundsveen/DW-trafikk

Conflicts:
	views/index.jade