joel fixed the sounds issue by removing turbolinks
fixed merge conflict on application.js