test test 1 2
test test 1 2 3
Merge branch 'feature/testing' into develop
Added new landing page, kept old for references
added placeholder things in landing page
Merge branch 'feature/cleanup-landing' into develop
fixed container fluid issue on all pages
added some functionality to search widgets, updated landing page with link to temp wiki
added search.js
oauth started
pushing to feature/login
merging login with feature/login
updated readme
updated .gitignore
removing env
added landing page
added window dressing for landing page
can sign in and out of django and google without widget button
took out unused file main.js
updated search results page, added sections to search criteria