test damien function
Merge branch 'master' of https://github.com/loicoceanet/test

Conflicts:
	Untitled.php