first commit
Merge branch 'master' of github.com:jjungo/SimpleMediaPlayer
fix merge conflict...