Completed everything except shuffle and delete
Merge branch 'master' of github.com:mks65-dw/tunez