megaman-like game - first commit
Merge branch 'master' of https://github.com/luizrogeriocn/unityLearning

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ProjectSettings.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/QualitySettings.asset
	ProjectSettings/TagManager.asset
first commit