merge conflicts

diff --cc pages/20200609230839.md
index b1f53e24c9d7648d53d13af5aa2717a96744b2a6,30c4276610b3a6ff13307c79bfda4506ab6197ed..6e01a8c668cbcd6dd25e9ee6b6ab8acde3873901
--- 1/pages/20200609230839.md
--- 2/pages/20200609230839.md
+++ b/pages/20200609230839.md
@@@ -1,5 -1,5 +1,4 @@@
  @tags todo
--
  # Todo List
  
  ## Now
@@@ -16,8 -14,9 +13,9 @@@
  * broken builds
  
  ## Soon
 -* Allen's review write-up
 -* Get a dongle and DiVa setup for Randy
 +* review write-up
 +* Get a dongle and DiVa setup
+ * Look over ASPICE docs
  
  ## Later
  * Asciidoc documentation for CVP
@@@ -25,5 -24,6 +23,6 @@@
  
  ## Follow-Up
  * Corporate Gen 2 Backlight issue on startup
 -* AR0233 Development (Will)
 +* AR0233 Development
+ * Raspberry Pi integration rig