cleaning up
Merge branch 'master' into meltwitter
merged conflicts with master
nav-bar visible at sign in only; added buttons
changed background, provider colors; font and image size consistent
Merge pull request #26 from BlakeJenningsJohnson/styling

Styling