Edit View finished
Merge branch 'master' of https://github.com/drw86312/Peek-a-Boo