projects
Merge branch 'master' of https://github.com/jelicich/pet-magick

Conflicts:
	templates/petProfile.php
	templates/videoPosta.php
merge puto de video

asd