first change on master
second change on master
Merge pull request #1 from ncolton/master

working from master is bad?