Merge branch 'master' of https://github.com/vaibhavsuri/watermelon2014

Conflicts:
	Watermelon/watermelon/group5/Coloring.class
	Watermelon/watermelon/group5/Coloring.java
	Watermelon/watermelon/group5/Packing.class
	Watermelon/watermelon/group5/Player.class
	Watermelon/watermelon/group5/Player.java
Merge branch 'master' of https://github.com/vaibhavsuri/watermelon2014

Conflicts:
	Watermelon/watermelon/group5/Coloring.class
	Watermelon/watermelon/group5/Coloring.java
	Watermelon/watermelon/group5/Packing.class
	Watermelon/watermelon/group5/Player.class
	Watermelon/watermelon/group5/Player.java