Ignoring UpgradeLog.html
Merge branch 'anthony'

Conflicts:
	.gitignore