search page returns results
Search and timeline work fully and are linked
search working alpha
Merge branch 'pages' into search

Conflicts:
	app/views/includes/header.jade