Fixed merge conflicts
Merge branch 'master' of https://github.com/tmzhuang/pvz-reloaded

# By Arzaan Irani (1) and Christopher Nguyen (1)
# Via Christopher Nguyen (2) and Arzaan Irani (1)
* 'master' of https://github.com/tmzhuang/pvz-reloaded:
  Updated SquareLabel.java with the zombies.
  fixed merge issues