started property search -- added photos
Merge branch 'master' of https://github.com/ldm810/Making_Data_Matter

Conflicts:
	html/photo-gallery.html
	html/sidebar.html
	html/sign-in.html
Fixed Sidebar

There was a double "discussion board" link on all the pages
Fixed Sidebar, added rough settings page