Merge pull request #8 from lasharn/master

Playback and layout of Edit fixed
Error Checking improved and progress bar works for edit
Comments have been added to the code
made some chnages when testing
resolved conflicts
Merge branch 'pietasty-master'

resolved conflicts