Merge branch 'master' into kyle
Messed up readme.md
Merge branch 'kyle'