a few fixes to views
Merge branch 'master' of https://github.com/mwinterfeld/Facebook_Project

Conflicts:
	app/views/posts/search_result.html.erb