Worked on edit mode
Merge branch 'master' of https://github.com/Rodrigo2244/APUS