commenting is half done and is completely custom
fixes those damn merge conflicts
Merge branch 'master' of github.com:JacksonGariety/The-List