resolving storyboard xml errors
Merge pull request #9 from jeremyhintz/fixing-storyboard-conflicts

resolving storyboard xml errors