Fix the fixes
TDD: 1, Me: 0
Uhm.
Can now add words to tree
updated error handler
Merge remote-tracking branch 'origin/template-engine' into spyware-words
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
Minor visual changes
merge origan/master into spyware-words
Remove submit button

Enter works fine
fixed error
Merge branch 'design'
fixed database return votes
Merge origin/spyware-words to origin/master
Make voting work.
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word

Conflicts:
	wordbyword.py
Don't rename imports!
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