android studio push
Merge https://github.com/Daekyu/BigstarPlayerView

Conflicts:
	.gitignore
merge