Added flowers
Merge remote-tracking branch 'origin/master' into eb_flowerpower

Conflicts:
	Assets/Scenes/MainGameScene.unity
Added happy grass
Merge remote-tracking branch 'origin/master' into eb_flowerpower
Merge pull request #22 from sonelliot/eb_flowerpower

Flower power!