edit gitignore
assets compiles
edit .gitignore
Merge branch 'hotfix/fix_assets2'

* hotfix/fix_assets2:
  edit .gitignore
  assets compiles