pushing the settings page
Merge branch 'master' of github.com:AquaVision/Vmart