rgergs
ujj
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe3

Conflicts:
	Savior/Assets/Scenes/Savior Level.unity
	Savior/Library/assetDatabase3
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe3

Conflicts:
	Savior/Assets/Scenes/Savior Level.unity
	Savior/Library/assetDatabase3