Editor Fixes
Merge branch 'master' of https://github.com/lilyc5459/cs3152