add new changes
Merge branch 'master' of https://github.com/ladpal/Final

Conflicts:
	index.html