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
specify starred_stories association on user in addition to user.stories
Merge branch 'master' into welcome-screen
Merge branch 'master' into welcome-screen
Merge pull request #22 from purple-martins-2013/starred_stories

specify starred_stories association on user in addition to user.stories
Merge branch 'master' of https://github.com/purple-martins-2013/storyward
remove automatic hiding of force graph
populate profile page with user content, create helper method for users favorite authors
change timing and display characteristics of text from content
migrate css to external sheets
refactor out css from views
nice beveled edge on images
Merge branch 'master' into profile_page
add tinymce editor to content field
display content as html in stories
Merge pull request #26 from purple-martins-2013/d3_refactor

Refactoring D3 and CSS
Merge pull request #27 from purple-martins-2013/profile_page

Profile page content fill