added module seven
index
added smile
added module eight
fixed merge conflict