removed meta_search
Merge branch 'master' of github.com:namsterdamus/Nam-Mac-Pin

Conflicts:
	app/assets/stylesheets/pins.css.scss
	app/views/pages/about.html.erb
	app/views/pins/show.html.erb