Module 7 removed and items from module 1 updated
Merge branch 'master' into feature1

Conflicts:
	index.html
Merge pull request #8 from memsrojo/feature1

Feature1