Merge branch 'master' of github.com:jeena/GGS-report

Conflicts:
	report.lyx

bibliography.bib

@@ -242,3 +242,31 @@
  isbn = {0201702452},
  publisher = {Pearson Education},
 } 
+
+
+@inproceedings{667766,
+  address = {London, UK},
+  author = {Haakan Mattsson and Hans Nilsson and Claes Wikstrom},
+  booktitle = {PADL '99: Proceedings of the First International Workshop on Practical Aspects of Declarative Languages},
+  interhash = {3b61289b4cf321234fcef209681d70e6},
+  intrahash = {f9f1e5b94bbcd945aa03459ad1698f61},
+  pages = {152--163},
+  publisher = {Springer-Verlag},
+  title = {Mnesia - A Distributed Robust DBMS for Telecommunications Applications},
+  url = {http://portal.acm.org/citation.cfm?id=645769.667766},
+  year = 1998,
+  timestamp = {2007-12-06T05:02:39.000+0100},
+  keywords = {database distributed erlang mnesia},
+  added-at = {2007-12-06T05:02:39.000+0100},
+  description = {Mnesia - A Distributed Robust DBMS for Telecommunications Applications},
+  isbn = {3-540-65527-1},
+  biburl = {http://www.bibsonomy.org/bibtex/2f9f1e5b94bbcd945aa03459ad1698f61/jhammerb}
+}
+
+@MISC{webstorage:website,
+      AUTHOR = "Ian Hickson",
+      TITLE = "Web Storage -- Editor's Draft 27 April 2011",
+      MONTH = "May",
+      YEAR = {2011},
+      URL = "http://dev.w3.org/html5/webstorage/"
+}