Merge pull request #119 from jackykschou/BrandonSprint11

Brandon sprint11
Merge branch 'develop' into BrandonSprint11