repositioned player, image changes
conflict resolve
more styling changes, default player image
gitignored ds_store
Merge pull request #19 from paulhyunkim/tsangbranch

DS-store changes, resolved conflicts