Merge branch 'master' of github.com:manavortex/FurnitureCatalogue

Author git <vivec@telvanni.eu>
Author date 2019-01-05 10:48:06
Author local date 2019-01-05 11:48:06 +0100
Committer git <vivec@telvanni.eu>
Committer date 2019-01-05 10:48:06
Committer local date 2019-01-05 11:48:06 +0100
Commit 4f5794fcaed98bf2c7db87db99df82c0059eeabb
Tree cd6b778d979d4139df4088d5ad2db8237ccb3b97
Parent fa28137a0f41457708829a8ef36e4875c13fc163
Parent 533824f47d74152024b8807e27652de4667db126
Merge branch 'master' of github.com:manavortex/FurnitureCatalogue