update index
completed merge
added testing section
added exercise place holders