On branch master/origin merge trying to fix userprefs conflict problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/New Unity Project.userprefs