comitting before I pull Parallelism
Merge branch 'master' of github.com:dhp1161/html5Template

Conflicts:
	index.html