new file:   index.php
Merge branch 'master' of github.com:matheusfgarcia/phpLoL

Conflicts:
	index.php

	deleted:    zlokomatic/phpLoL/index.php