messed up merge resolution last time, this one is right
fixed nav_search decorator
resolved merge conflicts for welcome.html and application.py