Added Dustin's code to main.
Merge pull request #2 from ahfergus1/master

Codez2