changed directory location
edit merge conflicts
Merge pull request #3 from makakoa/test_branch

Changed directory to be located one folder up