con rollback o algo asi
Merge branch 'master' of https://github.com/burngeek8/Ranking

Conflicts:
	index.php