updated things
resolved conflicts
Merge pull request #18 from Sara-lily/master

Resolved conflicts