Merge pull request #1 from BHelstrom/master

Testing updates
Shaun's Changes removed Junit*
Added comment
Merge pull request #3 from mzs5440/master

Made Changes
Merge pull request #2 from sam394/master

Shaun Added Changes