Testing merge functionality with Justin
Merge pull request #7 from GavinDBrown/master

Testing merge functionality with Justin