Merge branch 'ChrislS-master'

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "pelican-flickr"]
 	path = pelican-flickr
 	url = https://github.com/La0/pelican-flickr.git
+[submodule "better_code_samples"]
+	path = better_code_samples
+	url = git@github.com:ChrislS/better_code_samples.git

better_code_samples

@@ -0,0 +1 @@
+Subproject commit 91717a204bbd0ae4a1af6fe25ac5dd783fb4a7db