goodnight
merge
Merge branch 'dev'
fix js
clean up js
broken welcome image on mobile
don't know why the front image is broken now