Finalized styling for MVP for the app.
Fixed merge conflicts
Merge pull request #44 from pocket-gophers-2014/additional_styling

Finalized styling for MVP for the app.