Started to work on edit.php among other things
Merge pull request #7 from drewguild/DG/edit

Started to work on edit.php among other things