astf
asfMerge branch 'master' of https://github.com/Belbertn/Flappy

Conflicts:
	Flappy/Flappy.suo
	Flappy/Flappy/Flappy/Flappy.csproj.Debug.cachefile
	Flappy/Flappy/Flappy/obj/x86/Debug/ContentPipeline-{11185778-54E2-44F1-942D-E5FA6B6CED0B}.xml
	Flappy/Flappy/Flappy/obj/x86/Debug/Flappy.csproj.FileListAbsolute.txt
	Flappy/Flappy/Flappy/obj/x86/Debug/cachefile-{11185778-54E2-44F1-942D-E5FA6B6CED0B}-targetpath.txt