edits
Merge branch 'master' of github.com:balancerockmedia/random_stuff