.gitignore
Merge branch 'master' of https://github.com/MartinRumanek/K5-AndroidPlayer

Conflicts:
	K5-AndroidPlayer.iml