try to do not get an error
Merge branch 'master' of https://github.com/Basti25/country-quiz

Conflicts:
	index.php