revert
Merge branch 'master' of https://github.com/flygplan/pappacam

Conflicts:
	adidas.jpg
	nike.jpg