made changes to readme
made changes to error page
Merge branch 'testing'