Creando Prefabs
ReCreando Prefab
Merge branch 'master' of https://github.com/maraoz/GlobalGameJam2013

Conflicts:
	Heartbeat/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Constructor.FBX
	Heartbeat/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_diffuse.png
	Heartbeat/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_normals.png
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/FlameE.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Poof1.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Smoke Trail.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Smoke.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Smoke1.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Smoke2.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Smoke3.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Smoke4.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Snowflake.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/SoapBubble.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Spark.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Sparkles1.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Sparkles2.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Water Splash1.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Materials/Water Splash2.mat
	Heartbeat/Assets/Standard Assets/Particles/Sources/Textures/ColorFlare.png
	Heartbeat/Assets/Standard Assets/Particles/Sources/Textures/DustPoof.psd
	Heartbeat/Assets/Standard Assets/Particles/Sources/Textures/Fireball.psd
	Heartbeat/Assets/Standard Assets/Particles/Sources/Textures/Snowflake.tif
	Heartbeat/Assets/Standard Assets/Particles/Sparkles/Sparkle Rising.prefab
	Heartbeat/Assets/Standard Assets/Particles/Water/Water Fountain.prefab
	Heartbeat/Assets/Standard Assets/Particles/Water/Water Surface Splash.prefab