editing assets mostly
fixed merge
added image assets from 2 commits ago