First commit
Second commit
Merge branch 'master' of https://github.com/madleen/projets_master

Conflicts:
	Google/Cache/File.php
	index.php
ok