added error window, pass the error message as a string to the constructor to display it
Merge branch 'master' of https://github.com/bsanders/softeng
premerge cpmmit
Merge branch 'master' of https://github.com/bsanders/softeng