Added pelican-flickr, fixed conflict in gitmodules

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "pelicanfly"]
 	path = pelicanfly
 	url = https://github.com/bmcorser/pelicanfly.git
+[submodule "pelican-flickr"]
+	path = pelican-flickr
+	url = https://github.com/La0/pelican-flickr.git

pelican-flickr

@@ -0,0 +1 @@
+Subproject commit e1b6dddf2cd12aef4096d2b01e5af6e15d46683a