Removed test.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/shared/layout.jade
Merge remote-tracking branch 'origin/master'
Fixed bug with greedy route.