Merge branch 'kyle'
updated a bit of the readme
updated a bit of the readme
updated a bit of the readme — last time for today, sorry
Merge branch 'kyle'
Merge branch 'master' into kyle