more awesome comments 4 u bro
fixed merge conficts, stage1 working
Merge branch 'master' of https://github.com/ericlathrop/apt-213-the-struggle