Merge branch 'master' of https://github.com/bigbone/fbPlayer

Conflicts:
	README.md