popUp not blocking
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into develop