it told me to
Merge branch 'master' of https://github.com/richard-1990/rich.ardpric.es

Conflicts:
	index.php