Steve's first awesome commit
Merge pull request #1 from mjbrown/Steve_firstbranch

Steve's first awesome commit