changed file references
resolved merge conflict in index.js
addressed merge conflicts
pre merge
stupid merge thing
Merge remote-tracking branch 'origin/webcam' into clientTree
fixed login
basic theme integration on home page - still in dev
saving point - do not merge
Getting ready to switch to master
stupid git
Merge branch 'master' into clientTree
sending out for Nathan
merge with logan's branch
saving point - do not merge
added crawler test and fixed crawler module
webcam photos are successfully saved to the db thru a temporary route, kind of janky because i removed all joi validation in order for it to work, we'll suss it out when the time comes to implement it into the final UI of the site.
added scraper, need to migrate code to crawler model now
fixed grunt errors
updated crawler code