made some changes to html, mongo and added stuff to app.py
mostly working version of proj
fixed merge errors