December 12 files
Merge pull request #3 from dstockto/dec-12-2013

December 12 files
Updates for December 12 coding session
Merge pull request #4 from dstockto/dec-12-2013

Updates for December 12 coding session
Merge commit '9c85abd42c2e71caa0646201e05d65948a2a95ce'