changed a ton of stuff for prototype
changed a ton of stuff for prototype
fixed merge
changing things
changing things
fixing
Merge branch 'master' into requests
change naming bids
testing to fix build
adding results query and return
moved results
finalizing results.py
added queries back to db.py
Fixing old merge issues
Fixing old merge issues
Merge branch 'requests'