for real this time
Admins controller
merge
added updated sql
committing admin controller
merge conflicts in bookmarks fixed
admins push
views updated to reflect correct urls - admins controller updated
merge conflict in BookmarksController