remove displays
Merge branch 'master' of github.com:lostleaf/cpu
resolve conflict