Nothing new here; just omar's branch.
Just added instance variables to Food
	renamed:    rubberduck.jpg -> duck.jpg
	modified:   ../com/masterchef/Food.java
	modified:   ../com/masterchef/Game.java
	new file:   ../../../masterchef-desktop/.classpath
	deleted:    ../../../masterchef-desktop/bin/.gitignore
	modified:   ../../../masterchef-desktop/bin/com/masterchef/DesktopGame.class
	modified:   masterchef/Food.java
	modified:   masterchef/Game.java
Merge branch 'master' into omarmaster

Conflicts:
	masterchef-desktop/.classpath
	masterchef/src/com/masterchef/Game.java
fixed food.java
Merge branch 'master' of https://github.com/omarhegazy/Masterchef

pulling new stuff
Merge branch 'omarmaster'

	modified:   ../../../../masterchef-desktop/.classpath
	new file:   ../../assets/chicken.jpg
	new file:   ../../assets/duck.jpg
	modified:   Chef.java
	modified:   Food.java