added comments in server code
Reversed sorting
Added inline editing
added div vs card
fixing conflicts
Fixed major conflicts, adding admin to master
Merge pull request #210 from RTakes/conflictRes2

Fixing merge conflicts, adding admin