Merge pull request #1 from mikecrbenton/master

Pull request for changes 11/23
Tests

Added a placeholder comment to test the interaction between forked
repos.
Merge pull request #1 from Armadillus/master

initial test