Added some stuff

Added some dialog boxes
Merge branch 'master' of https://github.com/wisingd/Dajoroli