test
Squashed 'public/' content from commit bd15618

git-subtree-dir: public
git-subtree-split: bd1561870a0c593c9cbaed4935426ef6ab08a795
Merge commit '5a7e946865efe8672e30d0d2cf695c1fc4b9993c' as 'public'
Merge commit 'bd1561870a0c593c9cbaed4935426ef6ab08a795'
Updating site
Merge commit 'b673ae24e6b7eb3a88bbcc23dd3e0fbce12af672'

Conflicts:
	public/index.html
test
Squashed 'public/' content from commit b2f01dd

git-subtree-dir: public
git-subtree-split: b2f01dd853cdac62a86681ae261342fc8c2571ae
Merge commit '23bed80c527d71b5430c43c0bc27eca3f298a9f4' as 'public'
Merge commit 'b2f01dd853cdac62a86681ae261342fc8c2571ae'
test
Squashed 'public/' content from commit 5b5733d

git-subtree-dir: public
git-subtree-split: 5b5733d8db732936872f79455c80ece8c1651781
Merge commit 'b5285ca814e75673e8818c9753476bef7803658c' as 'public'
Merge commit '5b5733d8db732936872f79455c80ece8c1651781'
test
Squashed 'public/' content from commit 6740501

git-subtree-dir: public
git-subtree-split: 6740501cbd96fd49411d9f3939805696d084b556
Merge commit '982ec6ded834bbd663de34e1cab9d5a2871f0442' as 'public'
test
Updating site