Nicole journal 2013/10/29
Merge pull request #22 from fox-squirrels-2013/nicole_journal

Nicole journal 2013/10/29