dsfdsf
Scripts
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe3

Conflicts:
	Savior/Library/assetDatabase3
	Savior/Library/guidmapper
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe3

Conflicts:
	Savior/Library/assetDatabase3
	Savior/Library/guidmapper
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe3

Conflicts:
	Savior/Library/assetDatabase3
	Savior/Library/guidmapper