Foto selección
Merge branch 'master' of https://github.com/nimanym/fliquer

Conflicts:
	index.php