Fixed list description for browser size and arrow
table header changes
Everyday we're mergin'
Allowed multi line descriptions
Name buttons sensibly.
Merge branch 'design' of https://github.com/ncss-2014-group-3/word-by-word into design
Merge branch 'master' into design

Conflicts:
	templates/word.html
Tada!
Added Gotham font
Merge remote-tracking branch 'origin/design' into design

Conflicts:
	templates/stories.html
Fixed styling for next word box

Submit with enter key, and simplified design.
Merge branch 'design' of https://github.com/ncss-2014-group-3/word-by-word into design

Conflicts:
	templates/word.html
made blurb
Fixed ordering bugs
Added gotham font
Merge branch 'User' of https://github.com/ncss-2014-group-3/word-by-word into User
Added favourite_child() property to word.py
Merge branch 'design' of https://github.com/ncss-2014-group-3/word-by-word into design

Conflicts:
	static/css/viewstory.css
	templates/word.html
Merge branch 'design' of https://github.com/ncss-2014-group-3/word-by-word into design
fixed bad query for story list

needs ordering fix