rename file
Merge branch 'develop' of github.com:godgunman/trizza into develop

Conflicts:
	web/images/developer1/bodyoriginal.png