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

Author git <vivec@telvanni.eu>
Author date 2018-08-25 13:52:45
Author local date 2018-08-25 15:52:45 +0200
Committer git <vivec@telvanni.eu>
Committer date 2018-08-25 13:52:45
Committer local date 2018-08-25 15:52:45 +0200
Commit 22a1889d5009503c545e0f2246f3530ac07bbd89
Tree 58500a28ad60bc28fae7b6fb682498d5befcb90e
Parent c91a8fac08bb89337633e935d8d71ad3a0c76ab8
Parent 30c9ffd40c6702fb9b73440e6ecdce59de8778d5
Merge branch 'master' of github.com:manavortex/FurnitureCatalogue