practicing mergin
Merge branch 'master' of github.com:DormantJinius/gittest

Conflicts:
	index.html