JPG --> PNG
Merge branch 'master' of https://github.com/mmk13a/flowerpower

Conflicts:
	team.html