fta written
Merge branch 'master' of https://github.com/ItsMrLin/cs3251pa2