order funct syntax fix 1.4 - the real one
Merge branch 'master' of https://github.com/tmlai/CMPUT410-TTHE-Group-Project