changed constructor argument to only uid

added setCharacter() method
Merge branch 'master' of https://github.com/ChaoHou/SWEN222Assign1