Commit 7
Merge branch 'master' of https://github.com/darkkhen/test

Conflicts:
	index.html