Corrected bug
Better error handling (using QDebug rather than cout)
Merge branch 'master' of ssh://github.com/cs-au-dk/Artemis