commit merged file
Updated front-end javascript for showing fading effects