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

Conflicts:
	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