Deleted old assets folder
Added assets into canvas
Fixed assets conflict between my branch and master