Protoman animations
Merge remote-tracking branch 'origin/master'

Conflicts:
	Retro Game Jam July
2014/Assets/Animations/Megaman/Animators/megaman.controller
	Retro Game Jam July 2014/Library/ScriptAssemblies/Assembly-CSharp.dll
	Retro Game Jam July
2014/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Retro Game Jam July 2014/Library/assetDatabase3
	Retro Game Jam July
2014/Library/metadata/24/24ddca4ce35db424cadbf5f431b6cd77
	Retro Game Jam July
2014/Library/metadata/a2/a27524297348e444a896e31403ff1410
	Retro Game Jam July 2014/Temp/__EditModeScene