testing for conflicts
Aaron's conflict
Merge pull request #8 from atucker/master

testing for merge