trying to get my project to work
Merge pull request #1 from yfarjoun/testing

trying to get my project to work