added fig
app
added loading
fixed merge conflicts
loading
pics from back in time