changed stuff about the confederate to reflect accurate study design
Merge branch 'master' of https://github.com/simonzheng/simonzheng.github.io
moved presentation up