joshuamartin/joshtest — pull request #2 by joshuamartin (2013-08-15 09:05:57+00:00)
Title: B002 new diary chapter

add chapter2 to dev, plus some lines added to diary