create project
Merge branch 'master' of github.com:tyorikan/SampleAndroidMediaPlayer

Conflicts:
	.gitignore