failed merge
failed merge

borndangerous/xkcd-substitutions,Posnet/xkcd-substitutions,m1c0l/xkcd-substitutions,borndangerous/xkcd-substitutions,piquan/xkcd-substitutions,Posnet/xkcd-substitutions,piquan/xkcd-substitutions,m1c0l/xkcd-substitutions