testing merge with github
Merge pull request #1 from john-avoip/master

Testing forking and stuff