completed
refactoring completed
merging branch
fixed file
commiting file
Merge branch 'functional-player-controls'
merging
fixing merge issue, merge wrong branch
fixed conflicts and merge issue verythings is now current with completion of checkpoint