Part of the sound effects
Merge branch 'master' of https://github.com/cpadilla/frc1

Conflicts:
	FRC1/Assets/Prefabs/Enemy.prefab
	FRC1/Assets/Scripts/Enemy.cs
	FRC1/Assets/Scripts/PlayButton.cs
Merge branch 'master' of https://github.com/cpadilla/frc1

Conflicts:
	FRC1/Assets/Scripts/Enemy.cs
	FRC1/Assets/Scripts/Player.cs
Merge branch 'master' of https://github.com/cpadilla/frc1

Conflicts:
	FRC1/Assets/FRC1.unity
Sounds and other featrues
Merge branch 'master' of https://github.com/cpadilla/frc1

Conflicts:
	FRC1/Assets/FRC1.unity
	FRC1/Assets/Prefabs/Enemy.prefab
	FRC1/Assets/Prefabs/Player.prefab
	FRC1/Assets/Scripts/Enemy.cs
	FRC1/Assets/Scripts/Player.cs
	FRC1/Assets/Scripts/PlayerShoot.cs
Merge branch 'master' of https://github.com/cpadilla/frc1