vcnickerson/M2 — pull request #8 by IanDonn95 (2014-09-03 22:21:12+00:00)
Title: Ian/dev

Merging designated p1 edits to master branch