bird controller
Merge branch 'master' of https://github.com/Banashark/FPS_Flappy

Conflicts:
	Assets/Scenes/Scene_1.unity
	FPS_Flappy.userprefs
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper