Merge branch 'master' of https://gitlab.inf.uva.es/danliza/proyecto-tfg

Merging...

Resources/Memoria/bibliografia.bib

@@ -1052,3 +1052,27 @@ Finalmente se reporta el volumen de la micropipeta siendo este 10.6 microlitos y
 	langid = {english},
 	file = {Snapshot:C\:\\Users\\ERICA\\Zotero\\storage\\B3T7N7QX\\52854.html:text/html;Texto completo:C\:\\Users\\ERICA\\Zotero\\storage\\XKCVNMZ9\\Object Management Group (OMG) - 2012 - Information technology - Object Management Group U.pdf:application/pdf},
 }
+
+% Riesgos
+
+@collection{ao_2011_2011,
+	location = {Hong Kong},
+	title = {The 2011 {IAENG} International Conference on Artificial Intelligence and Applications, the 2011 {IAENG} International Conference on Bioinformatics, the 2011 {IAENG} International Conference on Computer Science, the 2011 {IAENG} International Conference on Data Mining and Applications, the 2011 {IAENG} International Conference on Imaging Engineering, the 2011 {IAENG} International Conference on Communication Systems and Applications, the 2011 {IAENG} International Conference on Internet Computing and Web Services, the 2011 {IAENG} International Conference on Software Engineering},
+	isbn = {978-988-18210-3-4},
+	series = {International {MultiConference} of Engineers and Computer Scientists, {IMECS} 2011 : 16 - 18 March, 2011, the Royal Garden Hotel, Kowloon, Hong Kong / [Eds.: S. I. Ao ...]},
+	pagetotal = {766},
+	number = {Vol. 1},
+	publisher = {{IAENG}},
+	editor = {Ao, S. I. and International Association of Engineers},
+	date = {2011},
+	langid = {english},
+	file = {Ao y International Association of Engineers - 2011 - The 2011 IAENG International Conference on Artific.pdf:C\:\\Users\\Daniel\\Zotero\\storage\\CWG4ZFCF\\Ao y International Association of Engineers - 2011 - The 2011 IAENG International Conference on Artific.pdf:application/pdf},
+}
+
+@article{addison_controlling_2002,
+	title = {Controlling Software Project Risks – an Empirical Study of Methods used by Experienced Project Managers.},
+	author = {Addison, Tom},
+	date = {2002},
+	langid = {english},
+	file = {Addison - 2002 - Controlling Software Project Risks – an Empirical .pdf:C\:\\Users\\Daniel\\Zotero\\storage\\W4VNYYDT\\Addison - 2002 - Controlling Software Project Risks – an Empirical .pdf:application/pdf},
+}
\ No newline at end of file