Merge pull request #161 from dubek/guide-time-ms-conj
authorJoel Martin <github@martintribe.org>
Mon, 1 Feb 2016 17:31:56 +0000 (11:31 -0600)
committerJoel Martin <github@martintribe.org>
Mon, 1 Feb 2016 17:31:56 +0000 (11:31 -0600)
guide: Document time-ms and conj


Trivial merge