started about page
Merge branch 'master' of https://github.com/NathanielWroblewski/WebFlashCards into about_page

Conflicts:
	public/css/application.css
started about page
fixed merge conflicts with application.css