updated test
test 2
Merge pull request #1 from aaron90turner/gittesting

Gittesting