Fixed crashing bug
Merge branch 'master' of https://github.com/garrisoh/Simon-ConCATination
Fixed conflict with .pro file