Updated for summer.
Merge branch 'master' of github.com:njitacm/SmartDisplay