back up data
Merge branch 'master' of
https://github.com/nguyen-thuong-mulodo/DraftPlayer.git

Conflicts:
	DraftPlayer/src/com/mulodo/draftplayer/Activity_Player.java