first commit
initial commit
Merge github.com:edzer/spacetime