Changed to QtDialog
Merge branch 'master' of https://github.com/temogen/CS340-CourseProject

Conflicts:
	PirateAdventure/PirateAdventure.pro
changed to QtDialog
Change to UI
changes to UI

Conflicts:
	PirateAdventure/PirateAdventure.pro
changes