lagt till String data
Merge branch 'Emily'
Merge branch 'master' of https://github.com/Elmseld/sjuan