Test to see if display is working
Merge remote-tracking branch 'origin/joshua_develop' into develop