hopefully saving old stuff
hopefully old stuff
Merge https://github.com/rwongoberlin/CS361-Schemers into oldhub

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Resources/Fonts.meta
	Assets/Resources/Scripts/character.js
	Assets/Resources/Scripts/characterModel.js
	Assets/Resources/Scripts/gameManager.js
	Assets/Resources/Scripts/target.js
	Assets/Resources/Scripts/targetModel.js
	Assets/Resources/Scripts/tile.js
	Assets/Resources/Scripts/tileModel.js
	Assets/Resources/Textures/gem1.png
	Assets/Resources/Textures/gem1.png.meta
	Assets/start.unity
	Library/CurrentLayout.dwlt
	Library/ProjectSettings.asset
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/0a/0a6bd7cbdfb0e42c794cdf3612bb482e
	Library/metadata/1a/1af1b7923960549928a673c7f693c9e5
	Library/metadata/2c/2cca462617e3d43649d757477b686132
	Library/metadata/36/36966a96f61184e548b802d15de06839
	Library/metadata/93/9327eeb0014cb41878802c14794d86bb
	Library/metadata/95/95e9b2718754442d0931dc05e267798d
	Library/metadata/9b/9b51049d2314a49a18d6159e579f19b6
	Library/metadata/bb/bbfc642bf01a84bd2981701885357a76
	Library/metadata/db/db67eccc833e0430bbe2d4c15cfed19b
	Library/metadata/e1/e1261ff0752ef4645a335f145c8f5a28
	Temp/__EditModeScene
Merge https://github.com/rwongoberlin/CS361-Schemers into oldhub
implemented Devin's new textures
Implemented new textures
Merge branch 'oldhub'
merging added textures