removed display
Merge branch 'master' of https://github.com/SabinaS/eecs4340