first commit (is always so stupid first comment?
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
first commit (is always so stupid first comment?