google drive conflict cleaned up
timebase and test added (60%)
Merge branch '0.0.1-alpha' into gh-pages