...
Merge branch 'master' of https://github.com/radogado/skrill1

Conflicts:
	.DS_Store