deleted unneccessary javascript files and cleaned up reveal.js
solve merge conflict