search
Merge branch 'mike' of github.com:mlee284045/sidebar into isabelle
updated title
Merge branch 'mike' of https://github.com/mlee284045/sidebar into pat
changed views and urls
temporary merge commit
updated view to return both slide resource
finished merge commit with Pat stuff
updated css for sidebar
css account
pre-merge commit
Merge branch 'pat' of github.com:mlee284045/sidebar into mike
final merge commit before design review