"Removed link to MS homepage"
"A smile was added"
New file added
Merge branch 'issue20'
small changes, new paragraph
Add bug fix.
list added
Merge branch 'feature1'
merged branches feature1 and master
Conflicts:
	index.html