started writing tests
added admin users fixes #4
modifications to create admin user
show pages working but not perfectly
continued changes in the user model
begun to add pagination
finished with user listing
changes to delete users
set staging to ignore mailer errors
have working list user model
refined model to fit our website fixes #5
finished modifications
fixed merge conflict
fixed trash from merge
resolved conflict