editing your file
Merge pull request #1 from balancerockmedia/master

editing your file