Configuration de Apache et PHP pour C9
Merge branch 'aws-project' into four-in-a-row

Conflicts:
	.gitignore