Window 2

Content window 2
Merge branch 'master' of https://github.com/ukalufiahs/part4demo

Conflicts:
	index.html