two merger
Merge branch 'master' of https://github.com/dreeri/project1

Conflicts:
	index.html