fixed a bunch of stuff. working on message index
Merge branch 'master' of github.com:feigningfigure/wdi_project_1