aa
Merge branch 'master' of github.com:tiritchi/XCH2014

Conflicts:
	ressources/1/profile.jpg
	ressources/1/profile_resized.jpg
	test.php