--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue May 31 17:49:51 2016 +0200
@@ -0,0 +1,22 @@
+syntax: regexp
+
+^virtualenv/
+
+^__pychache__/
+^src/iconolab/config\.py$
+^src/static/iconolab/js/node_modules/
+^web/static/site$
+^\.pydevproject$
+^\.project$
+^\.settings/org\.eclipse\.core\.resources\.prefs$
+^\.settings/org\.eclipse\.core\.runtime\.prefs$
+\.pyc$
+\.DS_Store$
+^src/iconolab/media/uploads/
+^src/iconolab/media/cache/
+^src/db.sqlite3$
+^web/static/media
+^src/log\.txt$
+^run/log/
+^log$
+^sbin/sync/config\.py$
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/design/.~lock.components.odt#	Tue May 31 17:49:51 2016 +0200
@@ -0,0 +1,1 @@
+,IRI-JANE/baptisteh,iri-jane,20.05.2016 12:20,file:///C:/Users/baptisteh/AppData/Roaming/LibreOffice/4;
\ No newline at end of file

Binary file design/components.odt has changed