Changes For Rest Display
Merge branch 'master' of https://github.com/glp115/IST412