add two html windows: index and welcome.
Merge remote-tracking branch 'origin/master'