updated user index and new
Merge pull request #10 from natewinn/nate

updated user index and new
Merge branch 'master' into david
working out users bugs