v2.0

Final Version for the graduation project