index updates
Merge branch 'master' of github.com:ajmark/WiM-Prototype