Edit works now!

Ta-da!!! My work here is done.
Merge branch 'master' of https://github.com/julianweisbord/fhsapp_v2