fix for nil
Merge branch 'master' of github.com:ucsd-ra/ug_research_portal