Based merge
fixed bad query for story list

needs ordering fix
Fixed *fingers crossed* query
Fixed finally
Based merge again
FIXED stuff
fixed upvoting when not logged in
cleaned stuff up
fixed redirects when creating a new account
Changed green background to orange
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word
removed success message
Merge remote-tracking branch 'origin/master' into User