Merge branch 'working-branch'
Initial Project 4 Commit
Merge branch 'master' into working-branch
Working on adding in display for Project 4
Merge branch 'master' into working-branch