changes
Merge branch 'master' of https://github.com/phil-matti/newGittest

Conflicts:
	index.html
Merge branch 'master' of https://github.com/phil-matti/newGittest

Conflicts:
	index.html
 add new line