pp
pp
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe2

Conflicts:
	PizzaQuest/Assembly-CSharp-firstpass-vs.csproj
	PizzaQuest/Assembly-CSharp-firstpass.csproj
	PizzaQuest/Assembly-CSharp-firstpass.pidb
	PizzaQuest/Assembly-CSharp-vs.csproj
	PizzaQuest/Assembly-CSharp.csproj
	PizzaQuest/Assembly-CSharp.pidb
	PizzaQuest/Assembly-UnityScript-firstpass-vs.unityproj
	PizzaQuest/Assembly-UnityScript-firstpass.pidb
	PizzaQuest/Assembly-UnityScript-firstpass.unityproj
	PizzaQuest/Assets/Scenes/Level1.unity
	PizzaQuest/Library/AssetServerCacheV3
	PizzaQuest/Library/InspectorExpandedItems.asset
	PizzaQuest/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	PizzaQuest/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	PizzaQuest/Library/ScriptAssemblies/Assembly-CSharp.dll
	PizzaQuest/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	PizzaQuest/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	PizzaQuest/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	PizzaQuest/Library/assetDatabase3
	PizzaQuest/Library/expandedItems
	PizzaQuest/Library/guidmapper
	PizzaQuest/PizzaQuest-csharp.sln
	PizzaQuest/PizzaQuest.sln
	PizzaQuest/PizzaQuest.userprefs
	PizzaQuest/ProjectSettings/EditorBuildSettings.asset