.idea folder issues
merge conflicts from .ideas folder
readme
Merge pull request #6 from natalie03/master

readme