png files added
Merge branch 'master' of github.com:mromrell/Canvas-Game

Conflicts:
	.idea/workspace.xml
	images/peanut.png
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
bad food counter
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'