added some comments in the index page
resolved conflicts
deleted temp file for merging