Git issues recreated repo?
Merge branch 'master' of https://github.com/alexaverill/ESUS3

Conflicts:
	classes.php
	index.php