Removed javascript from index.jade and put it in a separate js file
conclude merge
removed conflicts