Changed function names.
Merge branch 'master' of https://github.com/choiboi/CSC318-Smardrobe
Changed function names.