Check if the new file changes are in
XYX
Merge branch 'master' of github.com:vbelkhale/shoplist

Conflicts:
	index.html
	newfile.txt