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
merge origan/master into spyware-words
fixed error
fixed database return votes
Merge origin/spyware-words to origin/master
merged master into spyware-voting