resolving merge conflict
Merge pull request #8 from xxSandiLLyxx/eatbyscraperrake

Continuing to merge the eatbyscraperrake into the master branch after pulling and resolving conflicts