Move js from public to app/assets
remove db file
add db to .gitignore
Move all from public to assets
Remove unnecessary files
Change resource type show
Resolve merge conflicts