codedbykids/trainingms — pull request #2 by smobleyii (2014-12-22 22:43:29+00:00)
Title: Syncing develop with master

Sync develop with master.