Actualizacion de archivos 11/07/2014
Realizacion de commit para ejecutar push a repositorio
Merge remote-tracking branch 'origin/rama-Daniel' into rama-Jhon

Conflicts:
	New Unity Project/Assets/Scene/Home.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/05/050aeeb24e5962247a5e6ff5a3f91fd1
	New Unity Project/Library/metadata/75/75a86bb2769c77d4fa8a71007ab9b2a4
	New Unity Project/New Unity Project.userprefs