added conclusion and more
merged latex file