Add display class
Merge branch 'master' of github.com:kcarta/lrl-semester-project