make changes.
Merge branch 'master' of https://github.com/pushmatrix/firstproject

Conflicts:
	index.html