rearranged index includes
Merge branch 'master' of https://github.com/benrbray/Pumpkin-Jam-Team-Surprise-Walrus