Merge pull request #9 from ThatCanadianGuy/master

updating back from master
added dod
Merge remote-tracking branch 'origin/Spencer-Branch'

Conflicts:
	test.txt