Merge pull request #7 from rw1993/master

finish index and almost finish userindex