fixed flaskapp and took screenshots, still working on college url
fixed merging conflicts with app folder