asdasdasdas
#YOLO
Merge branch '0.1.0/develop' of https://github.com/gameboy-gamejam/marvinxtinatycoon into 0.1.0/paulo/develop
up up and away
away from here
but it's alright
astig
Merge branch '0.1.0/paulo/develop' of https://github.com/gameboy-gamejam/marvinxtinatycoon into 0.1.0/develop

Conflicts:
	GameJam/src/com/gj/gb/model/GBStove.java
	GameJam/src/com/gj/gb/stage/AppleCatchingStage.java
	GameJam/src/com/gj/gb/stage/FishStage.java
	GameJam/src/com/gj/gb/stage/actors/Apple.java
	GameJam/src/com/gj/gb/stage/actors/Basket.java
	GameJam/src/com/gj/gb/stage/actors/Tree.java
	GameJam/src/com/gj/gb/stage/common/Stage.java