added about page
Merge pull request #34 from fayeishere/master

About Us - Fixes #6
Fixed merge conflicts in entries.css and application.html
Merge branch 'master' of github.com:portlandcodeschool/humanitywar-rails

Conflicts:
	app/assets/stylesheets/entries.css.scss
	app/views/layouts/application.html.haml