ssss

Signed-off-by: etimzaaa <dogtemples@gmail.com>
Merge branch 'master' of https://github.com/redroad/furniture

Conflicts:
	index.php

Signed-off-by: etimzaaa <dogtemples@gmail.com>