edits
Merge branch 'master' of https://github.com/xer0x/beginning