modified
Merge branch 'master' into HEAD
add js, img to assets