I took a machete to the index.
Merge branch 'wesley'

i think i committed?
I think we can do our presentation..mostly..