tree hash created
progress
finished for the night
json works
pid file deleted?
resolve merge conflicts
conflicts :(
last commit before deleting old code
legit tree
something...
works
out
almost there
warmer
conflicts
gitignore
gitignore
grrrrr
grrrrr
fuck git