make node show view
work on nodes show
resolve merge conflicts
change welcome screen, add twittera and facebook sign in
try figure out gems
adding sign in functionality
Merge branch 'master' into gravatar
Merge branch 'user_login' of https://github.com/purple-martins-2013/storyward
Merge branch 'master' into gravatar
resolve merge conflict
modify welcome background
make unique background for welcome screen
specify starred_stories association on user in addition to user.stories
add sign up links
resolve merge conflicts
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