updated master and push test01
second test
fuck a message
Merge branch 'master' of github.com:vsanchez1987/SpacePizza

Conflicts:
	SpacePizza_Main/Library/CurrentLayout.dwlt
	SpacePizza_Main/Library/assetDatabase3
	SpacePizza_Main/SpacePizza_Main-csharp.sln
	SpacePizza_Main/SpacePizza_Main.sln
localCommit
localcommitALL
1st commit 7/24
I have added a script in which the bullets get destroyed on contact with anything, this will keep it from staying in the playarea
made no changes
Merge branch 'victor'

Conflicts:
	SpacePizza_Main/Library/AssetServerCacheV3
	SpacePizza_Main/Library/CurrentLayout.dwlt
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpacePizza_Main/Library/ScriptMapper
	SpacePizza_Main/Library/assetDatabase3
	SpacePizza_Main/Library/metadata/ce/ce7e16b18049749599cd376308c1765c
	SpacePizza_Main/Library/shadercompiler-1.log
	SpacePizza_Main/SpacePizza_Main-csharp.sln
	SpacePizza_Main/SpacePizza_Main.sln
made no changes
Merge branch 'master' into Omar

Conflicts:
	SpacePizza_Main/Library/CurrentLayout.dwlt
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpacePizza_Main/Library/assetDatabase3
	SpacePizza_Main/Library/guidmapper
	SpacePizza_Main/Temp/__EditModeScene
Merge branch 'Omar'
created level mock-up
Merge pull request #10 from vsanchez1987/manmit

created level mock-up
added moving platforms
Merge pull request #11 from vsanchez1987/manmit

added moving platforms
Merge branch 'manmit'
merged manmit with master then branched to manmit2
Merge pull request #12 from vsanchez1987/manmit2

Manmit2