Basic setup for html pages done
Pull code from master