commit no head
commit log
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore