more changes
Merge pull request #3 from alivetocode/feature/scott/myChangesRule

more changes
add more shit
resolve merge conflict