Merge branch 'master' of https://github.com/conradkleinespel/42oo

Conflicts:
	ex00/config.php
	ex00/index.php
conflicted