updated search bar
Merge pull request #4 from shanemiller500/automailer

updated search bar
Trying to merge!Merge branch 'api'
I dont kbow why it wants me to do this
Merge pull request #5 from shanemiller500/master

Merge pull request #4 from shanemiller500/automailer
Merge pull request #6 from shanemiller500/automailer

Merge pull request #5 from shanemiller500/master
Merge pull request #7 from shanemiller500/master

Merge pull request #6 from shanemiller500/automailer
Merge pull request #8 from shanemiller500/automailer

Merge pull request #7 from shanemiller500/master
merge conflict
Merge branch 'master' of https://github.com/shanemiller500/Judgement-Day
update
almost done