p 2
Merge remote-tracking branch 'origin/master'
 p 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	LICENSE.md
 p 4