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

Conflicts:
	PizzaQuest/Library/assetDatabase3
	PizzaQuest/Library/guidmapper
	PizzaQuest/Library/metadata/09/09074e78774c33b4e9e44a9cb76182d0
	PizzaQuest/Library/metadata/50/5087a66ea9b645f42b259291e310f240
	PizzaQuest/Library/metadata/5b/5bde3465042272240a47d3d71dc40b2d
	PizzaQuest/Library/metadata/76/76abfd8f9a1dd0344ae09803adfd1009
	PizzaQuest/Library/metadata/93/93b785b6583104a479059159ee955b52
	PizzaQuest/Library/metadata/ef/ef796ef2ae6df244f8d43e5961bfd2df
	PizzaQuest/Library/metadata/fd/fdf637430a0bf084b976a1a99986264b
	PizzaQuest/Library/previews/09/09074e78774c33b4e9e44a9cb76182d0_/100014
	PizzaQuest/Library/previews/50/5087a66ea9b645f42b259291e310f240_/100000
	PizzaQuest/Library/previews/50/5087a66ea9b645f42b259291e310f240_/100002
	PizzaQuest/Library/previews/50/5087a66ea9b645f42b259291e310f240_/100006
	PizzaQuest/Library/previews/50/5087a66ea9b645f42b259291e310f240_/100008
	PizzaQuest/Library/previews/50/5087a66ea9b645f42b259291e310f240_/100012
	PizzaQuest/Library/previews/50/5087a66ea9b645f42b259291e310f240_/100014
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100002
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100004
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100006
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100008
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100010
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100012
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100014
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100016
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100018
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100020
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100022
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100038
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100040
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100042
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100044
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100046
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100056
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100070
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100072
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100074
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100084
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100088
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100090
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100092
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100094
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100100
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100104
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100106
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100108
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100110
	PizzaQuest/Library/previews/5b/5bde3465042272240a47d3d71dc40b2d_/100112
	PizzaQuest/Library/previews/83/8373f96d7b2ccae42b18eeef364adf6e
	PizzaQuest/Library/previews/ef/ef796ef2ae6df244f8d43e5961bfd2df
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100002
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100004
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100006
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100008
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100016
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100018
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100020
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100022
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100032
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100034
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100036
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100042
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100048
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100050
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100052
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100054
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100060
	PizzaQuest/Library/previews/fd/fdf637430a0bf084b976a1a99986264b_/100062