Done with 1. Working on 2
Merge https://github.com/Khoa94/Assign6