Final Faceboo & Twitter buttons, About Us edits
Merge branch 'master' into Sheri_about_sm

Conflicts:
	app/views/home/about.html.erb
Merge branch 'Sheri_about_sm'