Merge 2adb003de2e661f3e302c38aef0b086aea23e308 into ffe3af225fd232e486a4c3792c1ef17477c4dabc
Bumping version
dumb commit
Merge branch 'merge-test' of github.com:DavidTanner/Testing into merge-test
Merge pull request #9 from DavidTanner/merge-test

Merge test