Merge branch 'master' into master

author Ir1dXD <sirius.caffrey@gmail.com>

Thu, 29 Aug 2019 04:31:53 +0000 (12:31 +0800)

committer GitHub <noreply@github.com>

Thu, 29 Aug 2019 04:31:53 +0000 (12:31 +0800)
author Ir1dXD <sirius.caffrey@gmail.com>
Thu, 29 Aug 2019 04:31:53 +0000 (12:31 +0800)
committer GitHub <noreply@github.com>
Thu, 29 Aug 2019 04:31:53 +0000 (12:31 +0800)
diff --cc docs/math/lucas.md

index 0f0e8fa,61abd3a..61abd3a

mode 100644,100755..100644
--- 1/docs/math/lucas.md
--- 2/docs/math/lucas.md
+++ b/docs/math/lucas.md
diff --cc mkdocs.yml
Simple merge
author	Ir1dXD <sirius.caffrey@gmail.com>
	Thu, 29 Aug 2019 04:31:53 +0000 (12:31 +0800)
committer	GitHub <noreply@github.com>
	Thu, 29 Aug 2019 04:31:53 +0000 (12:31 +0800)
		1	2
docs/math/lucas.md	patch \|	diff1 \|	diff2 \|	blob \| history
mkdocs.yml	patch \|	diff1 \|	diff2 \|	blob \| history