Merge pull request #7 from lasharn/master

added comments
text conflict solved
Merge branch 'master' of https://github.com/pietasty/se206_a03
Merge pull request #8 from pietasty/master

playback buttons for Edit