Fixed fixed words. [fixed]
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word
Added user profile
Made story titles show in the <title> tag

Story titles now show the title of the story e.g. 'A story - Word By
Word'
Unbreak story tree styling.
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word

Conflicts:
	templates/viewstory.html
Merge branch 'design' of https://github.com/ncss-2014-group-3/word-by-word into design