starting search code
Merge branch 'navbar_search'

Conflicts:
	app/views/master.blade.php
	public/js/navsearch.js