Merge pull request #1 from guavajellyaaron/features/test

this is a test
Making a change to the test file
Merge pull request #2 from happygaijin/master

Making a change to the test file
Changed it to be awesome