updated for testing project
Merge pull request #1 from stevenalexander/testing-branch

updated for testing project