business page
lal
Merge branch 'master' of https://github.com/menvil/popwifi

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/menvil/popwifi

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/menvil/popwifi

Conflicts:
	css/faq.css
Merge branch 'master' of https://github.com/menvil/popwifi

Conflicts:
	css/faq.css
Merge branch 'master' of https://github.com/menvil/popwifi

Conflicts:
	faq.html
Merge branch 'master' of https://github.com/menvil/popwifi

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/menvil/popwifi

Conflicts:
	faq.html
Merge branch 'master' of https://github.com/menvil/popwifi
Merge branch 'master' of https://github.com/menvil/popwifi

Conflicts:
	faq.html