Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/65/65572a82ca2378644a4862924aa8b4a8
	Library/metadata/ce/ce2e2a3295df7884e8e89f3a96a52e2a

Merge remote-tracking branch
'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/65/65572a82ca2378644a4862924aa8b4a8
	Library/metadata/ce/ce2e2a3295df7884e8e89f3a96a52e2a

Merge
branch 'master'
of
https://github.com/SelfishGames/Game2

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3

Conflicts

Conflicts:
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper

Particle
system to guide

-Added a particle system to the guide
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/65/65572a82ca2378644a4862924aa8b4a8
	Library/metadata/ce/ce2e2a3295df7884e8e89f3a96a52e2a