free wifi
Merge branch 'master' of github.com:mhils/mitmdemo

Conflicts:
	client/app/scripts/templates/hack.ejs
Merge branch 'master' of github.com:mhils/mitmdemo