updatereadme

just a place so collaborators can log progress. Probably will end up
making us test the conflict merge function soon. I hope. Because that
means I'm not the only one pushing to the repo. :(
(relavent xkcd http://xkcd.com/1296/)