Made some sprites. Worked on collision.
Worked on collisions and added some sprites.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gamejam/brokenheart/BrokenHeart.java