Sycning PC files

Updated assets on OSX, now syncing on PC
sync to OSX
sync again to OSX
Merge branch 'master' of https://github.com/balcides/spaceFighter

Conflicts:
	.gitignore
	Assets/Scripts/sfMonoWorkspace.userprefs.meta