fucking newlines n'at
resolved merges
Merge branch 'master' of ssh://github.com/anthonyef/451-cheatsheet