Fixed ordering bugs
Merge branch 'User' of https://github.com/ncss-2014-group-3/word-by-word into User
Added favourite_child() property to word.py
fixed bad query for story list

needs ordering fix
Fixed *fingers crossed* query
Fixed finally
added auth for story
FIXED stuff
fixed upvoting when not logged in
cleaned stuff up
Merge remote-tracking branch 'origin/master' into User

Conflicts:
	wordbyword.py
fixed redirects when creating a new account
Fixed ordering of stories list
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