update
Merge branch 'master' of https://github.com/aroldoa/primo

Conflicts:
	index.php
up