do hex packing
Merge branch 'master' of github.com:edwardfxc/project3_group8 into hex

Conflicts:
	src/watermelon/GravityPacking/Player.java
Merge pull request #1 from edwardfxc/hex

Hex