first commit of vivashop
Merge branch 'master' of github.com:EdViva/vivashop