testing the git commit system
Merge branch 'master' of https://github.com/shevitza/Goofy