change order data types to string)
Merge branch 'master' into steph_thurs
Merge pull request #49 from brigid2718/steph_thurs

Steph thurs