Commit to sync
Merge branch 'master' of https://github.com/Befinger/TINA-project

Conflicts:
	pages/img/pato.png