profile page styling
Merge branch 'master' into profile_page_styling

Also finalized styles for show page.

Conflicts:
	app/assets/stylesheets/main.css
Merge pull request #12 from rjbernaldo/profile_page_styling

Profile page styling