simplified testing script
Merge branch 'master' of github.com:SWP-Ubau-SoSe2014-Haskell/SWPSoSe14
Support for expected fails in testing script