Another test

no
Ignore feature

Seeing if I gitignore will ignore a file
Merge branch 'development-branch'

Conflicts:
	index.html