Fix the fixes
TDD: 1, Me: 0
Uhm.
Can now add words to tree
Fixed layout for new story page
Minor design changes
updated error handler
Merge remote-tracking branch 'origin/template-engine' into spyware-words
Restyled error list on create page
dont displace error box if there are no errors
Changed h1 styling
Merge remote-tracking branch 'origin/master' into spyware-words
(I hope I did it right....)

Conflicts:
	static/css/viewstory.css
	template_engine/ForNode.py
	template_engine/parser.py
	wordbyword.py
Changed copyright symbel to &copy;
Removed footer margin
Minor text changes.
Minor text changes.
Added header caption
Minor colour changes
Merge branch 'master' into design

Conflicts:
	static/css/style.css
Add intro.