Edits
Merge branch 'master' of github.com:smo-key/sohacks