fetching pull request with conflicts
Merge branch 'master' into brian
Merge pull request #24 from bchiatt/brian

Brian