adding template for error page
adding features
Merge branch 'master' of github.com:bistmaster/trivia