Ignoring public/assets
Merge branch 'master' into adalandlily