basic html conf
ZMerge branch 'master' of github.com:lordkada/coderdojowifi