first commit
hello
adding ship assets
Fixing problems
Merge branch 'master' of https://code.google.com/p/frc1

Conflicts:
	FRC1/Library/CurrentLayout.dwlt
	FRC1/Library/assetDatabase3
	FRC1/Library/guidmapper

Submitting. Elapsedtime
i dont even know
a
commit
Merge branch 'master' of https://code.google.com/p/frc1

Conflicts:
	FRC1/Library/CurrentLayout.dwlt
	FRC1/Library/assetDatabase3
	FRC1/Library/guidmapper
Committing all changes
Merge branch 'master' of https://code.google.com/p/frc1

Conflicts:
	FRC1/Library/assetDatabase3
Commiting
commit changes
Merge branch 'master' of https://code.google.com/p/frc1

Conflicts:
	FRC1/Assembly-CSharp-vs.csproj
	FRC1/Assembly-CSharp.csproj

Testing
Comitting
d
removing ngui
adding camera Scripts/MainCamera.cs
camera follows player now
Pushing ignorefile