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

Conflicts:
	PizzaQuest/Library/assetDatabase3
	PizzaQuest/Library/guidmapper