Merge Create Patient Demographic to Main Solution

I also deleted the other solution I committed