Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

9 files changed, 39 insertions, 0 deletions

diff --git a/data/sounds/user/sexy/LICENSE b/data/sounds/user/sexy/LICENSE
new file mode 100644
index 0000000..99238dc
--- /dev/null
+++ b/data/sounds/user/sexy/LICENSE
@@ -0,0 +1,39 @@
+Files: error/error.ogg
+Source: http://www.freesound.org/people/Corsica_S/sounds/56097/
+Copyright: 2008, Corsica_S
+License: CC-BY-3.0
+
+Files: login/welcome back sexy bitch.ogg
+Source: http://www.freesound.org/people/Corsica_S/sounds/99889/
+Copyright: 2010, Corsica_S
+License: CC-BY-3.0
+
+Files: logout/what about me.ogg
+Source: http://www.freesound.org/people/epanody/sounds/86457/
+Copyright: 2010, Corsica_S
+License: CC-BY-3.0
+
+Files: logout/well if thats how you feel.ogg
+Source: http://www.freesound.org/people/epanody/sounds/86456/
+Copyright: 2010, Corsica_S
+License: CC-BY-3.0
+
+Files: purchase/yes, master.ogg
+Source: http://www.freesound.org/people/Corsica_S/sounds/107555/
+Copyright: 2010, Corsica_S
+License: CC-BY-3.0
+
+Files: purchase/your will is my command.ogg
+Source: http://www.freesound.org/people/Corsica_S/sounds/107556/
+Copyright: 2012, Corsica_S
+License: CC-BY-3.0
+
+Files: purchase/do it again.ogg
+Source: http://www.freesound.org/people/Corsica_S/sounds/95235/
+Copyright: 2010, Corsica_S
+License: CC-BY-3.0
+
+Files: purchase/what is next.ogg
+Source: http://www.freesound.org/people/Corsica_S/sounds/72257/
+Copyright: 2009, Corsica_S
+License: CC-BY-3.0
diff --git a/data/sounds/user/sexy/error/error.ogg b/data/sounds/user/sexy/error/error.ogg
new file mode 100644
index 0000000..bd0f41d
--- /dev/null
+++ b/data/sounds/user/sexy/error/error.ogg
diff --git a/data/sounds/user/sexy/login/welcome back sexy bitch.ogg b/data/sounds/user/sexy/login/welcome back sexy bitch.ogg
new file mode 100644
index 0000000..77fc7ac
--- /dev/null
+++ b/data/sounds/user/sexy/login/welcome back sexy bitch.ogg
diff --git a/data/sounds/user/sexy/logout/well if thats how you feel.ogg b/data/sounds/user/sexy/logout/well if thats how you feel.ogg
new file mode 100644
index 0000000..30fb42c
--- /dev/null
+++ b/data/sounds/user/sexy/logout/well if thats how you feel.ogg
diff --git a/data/sounds/user/sexy/logout/what about me.ogg b/data/sounds/user/sexy/logout/what about me.ogg
new file mode 100644
index 0000000..9ed10db
--- /dev/null
+++ b/data/sounds/user/sexy/logout/what about me.ogg
diff --git a/data/sounds/user/sexy/purchase/do it again.ogg b/data/sounds/user/sexy/purchase/do it again.ogg
new file mode 100644
index 0000000..6465c60
--- /dev/null
+++ b/data/sounds/user/sexy/purchase/do it again.ogg
diff --git a/data/sounds/user/sexy/purchase/what is next.ogg b/data/sounds/user/sexy/purchase/what is next.ogg
new file mode 100644
index 0000000..e3d3927
--- /dev/null
+++ b/data/sounds/user/sexy/purchase/what is next.ogg
diff --git a/data/sounds/user/sexy/purchase/yes, master.ogg b/data/sounds/user/sexy/purchase/yes, master.ogg
new file mode 100644
index 0000000..f0723a1
--- /dev/null
+++ b/data/sounds/user/sexy/purchase/yes, master.ogg
diff --git a/data/sounds/user/sexy/purchase/your will is my command.ogg b/data/sounds/user/sexy/purchase/your will is my command.ogg
new file mode 100644
index 0000000..3f07616
--- /dev/null
+++ b/data/sounds/user/sexy/purchase/your will is my command.ogg