Update user.rb to fix missing ends and dos
controllers
controllers
Merge pull request #29 from darrelljones13/dukegreene-sat

modified script sources and logout link
fixed logout route
fixed merge conflict in layout
Merge pull request #30 from darrelljones13/associations

Associations
added modal for search bar
Merge pull request #31 from darrelljones13/added-modal-for-search

added modal for search bar
testing tooltip implementation for circles
testing tooltip implementation for circles
trying alternate d3 styling, commented out