Change h1 to "Web"
added web 2.0
add s to ipsum
Merge branch 'master' of github.com:cw-prime/Skeleton

Conflicts:
	index.html
Add 2.5