Simplifying Focus View
Merge branch 'master' of github.com:Deco/HCI400Assignment
Made layout for player bar
Merge branch 'master' into musicplayer