galery
galery

Conflicts:
index.php
navigation.php
galery
Merge branch 'master' of https://github.com/Martin-Maxime/Avengers

Conflicts:
	index.php
	navigation.php