Merge branch 'master' of https://github.com/RemiDelhaye/ArrasFilmFestival

Signed-off-by: Thomas Leduc <tleduc2@hotmail.fr>

Conflicts:
	.gitignore