Update version
Ignore...
Merge branch 'master' of github.com:thomaschampagne/Hourglass
Update README.md
Merge remote-tracking branch 'origin/master' into TS005