Merge branch 'read_story' of https://github.com/purple-martins-2013/storyward into user_login
Merge pull request #16 from purple-martins-2013/navbar

Navbar
Merge pull request #21 from purple-martins-2013/user_login

User login
Merge pull request #19 from purple-martins-2013/gravatar

Facebook and Twitter profile images
Merge branch 'master' into welcome-screen
Merge branch 'master' into welcome-screen