Adding my assets
Fixing merge conflicts
Adding assets