x-testing added
Merge branch 'master' of https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14