Some major bug fixes in the view story page

It was all the swamp marshes
Merge remote-tracking branch 'origin/master' into design
Updated stories.html

Made welcome message a heading, added padding between description and
story list table
Merge remote-tracking branch 'origin/master' into User

Conflicts:
	templates/header.html
	wordbyword.py
Merge branch 'User' of https://github.com/ncss-2014-group-3/word-by-word into User