Nicole's Journal 2013/11/06
Nicole's journal 2013/11/07
Merge pull request #76 from fox-squirrels-2013/nicole_journal

Nicole journal 20131107