yay
Merge branch 'master' of github.com:dylanab/CS4300FinalProject
changed editorview