Did some collision stuff.
Fixed walking animation glitch.
Merge commit '741c137' into HEAD
Made Joe from SCRATCH :)))
Updating the sprites and how animation works.
Merge commit '5dd304b' into HEAD

Conflicts:
	src/gamejam/brokenheart/BrokenHeart.java
Trying to push.
Merge branch 'master' into artur
Merge branch 'master' of https://github.com/huntmiester/BrokenHeart

Conflicts:
	src/gamejam/brokenheart/BrokenHeart.java