Final changes
Merge branch 'master' of https://github.com/stevenng308/Component-Based-Term-Project