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

Conflicts:
	faq.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	css/faq.css