testing conflicts
Merge pull request #12 from andrewbackes/dev

testing conflicts