assets
Merge branch 'master' of https://github.com/jozefdransfield/VideoPlayer

Conflicts:
	VideoPlayer.fla