initial commit
Merge https://github.com/eli-davis/display