Implemented collectibles
Hurb
Added flower counter
Cloud and Tree shrine
Double Jump
Merge branch 'master' into collision

Conflicts:
	conf.lua
	main.lua
	player.lua
Added font
Merge branch 'master' into collision