Fix checks of result sets
Merge branch 'develop' of https://github.com/villepetersson/DAT255-Grupp12 into develop