Error handling in template added
Merge branch 'master' of github.com:dctr/reason

Conflicts:
	views/layout/top.ejs