update gitignore to include assets
accept merge