Test if I am using Git Hub correctly

Test if I am using Git Hub correctly
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scenes/scene3.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper