Tristan's first commit

Added a test comment
Merge pull request #1 from alycarter/Tristan

Tristan's first commit