added Diamond just to try it out
Added the Diamond in the middle of the screen
Diamond in the middle of the screen
Merge branch 'prototype' of https://github.com/sconealone/ggj14 into prototype
Problem with counting. overlap with cat and diamond works.
Finish player counter.
Merge branch 'prototype' of https://github.com/sconealone/ggj14 into prototype
Merge branch 'overlap' into prototype

Conflicts:
	js/Player.js