Fixed merge conflicts
Merge pull request #18 from Chunhao137/artsafari

(feat) Fixed merge conflicts on app.js