Berginson/12-06 — pull request #1 by cjbergin (2014-10-04 00:21:12+00:00)
Title: combined branches

merging numbers and master