Splitting Dragon Warrior demo out into its own project.  Rearranging source a little.
Fixing merge conflicts.