tests added but do not pass
removed current user id from index
fixed merge conflict
Merge pull request #50 from stevenaweiss/master

current user id removed from index, tests added, webkit probems