added smoke again
Merge branch 'master' of https://github.com/EECS290-Spring14-Team8/Multiplayer-Flight-Simulator-

Conflicts:
	Assets/Photon Unity Networking/Resources/Plane.prefab