Merge branch 'master' into temp_master

Conflicts:
	Assets/Materials/ÃªÃ®Ã°Ã¥Ã¸Ã®Ãª.mat
	Assets/Materials/crosshair 1.mat
	Assets/Scenes/minigames/SpaceShooter!.unity.meta
	Assets/Scripts/Base.meta
	Assets/Scripts/SpaceShooter.meta
	Assets/Scripts/SpaceShooter/BulletManager.cs
	Assets/Scripts/SpaceShooter/Enemy.cs
	Assets/Shaders.meta
	Assets/SpaceShooter.meta
Merge branch 'another_temp_branch' of https://github.com/s00tie/cooking into merge

Conflicts:
	Assets/Assembly-CSharp-firstpass.pidb.meta
	Assets/Assembly-CSharp.pidb.meta
	Assets/Assembly-UnityScript-firstpass.pidb.meta
	Assets/Scenes/minigames/SpaceShooter!.unity
	Assets/Scenes/minigames/SpaceShooter!.unity.meta
	Assets/Scripts/Base.meta
	Assets/Scripts/GUI/GUIButton.cs
	Assets/Scripts/GUI/GUIWidget.cs
	Assets/Scripts/SpaceShooter.meta
	Assets/Scripts/SpaceShooter/BulletManager.cs
	Assets/Scripts/SpaceShooter/BulletShooter.cs
	Assets/Scripts/SpaceShooter/CircleShooter.cs
	Assets/Scripts/SpaceShooter/Enemy.cs
	Assets/Scripts/SpaceShooter/Scroller.cs
	Assets/Scripts/SpaceShooter/SpacePlayerController.cs
	Assets/Scripts/SpaceShooter/TargetShooter.cs
	Assets/Scripts/ToastScript.cs
	Assets/Shaders.meta
	Assets/SpaceShooter.meta
	ProjectSettings/TagManager.asset
BIG OL' SCORES
Merge branch 'master' of https://github.com/s00tie/cooking
merged with bob scene
Egg script works is completeable again.