CardSwipe & Computer

asdf
Merge branch 'master' of https://github.com/jltendler/Game2

Conflicts:
	Game2.userprefs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/5d/5deb888b692f44f48bab1173bf4f2cc5