added content to about page, change styling on main page.
Merge branch 'master' of https://github.com/markkudlac/fullsink_rails

Conflicts:
	app/views/layouts/application.html.erb