started to make the literature list
merged a conflict in introduction