nothing in seeMoreGifs
Merge branch 'master' of https://github.com/tommyb67/gifbomb into development
saving the seeMoreGifs file
Merge branch 'master' into development
Merge branch 'master' of https://github.com/tommyb67/gifbomb into development
added admin to users table.  Added an index view for admins only
beginning to work on wrapping users into a jQuery object
admin page has users with delete/change admin buttons
form helper
we have a a delete user button on the admin page
the delete button is now functioning properly
the demote admin function is now working
the promote and demote user admin features are now working
fixed merge conflicts with admins controlloer and the admin view
Merge pull request #8 from tommyb67/development

Development