testing again
Merge branch 'master' of https://github.com/shaw65/BlockWars

# By shaw65
# Via shaw65
* 'master' of https://github.com/shaw65/BlockWars:
  testing still

Conflicts:
	Assets/Untitled.unity
	Assets/Untitled.unity.meta
	Library/assetDatabase3
	Library/guidmapper