fixing compiling errors
Merge branch 'master' of https://github.com/hayesbh/ICDL14_Teammates
fixing compiling errors