first commit =D
Merge branch 'master' of github.com:CesarLanderos/KLSMusicPlayer

Conflicts:
	.gitignore
	README.md