I have changes!

These are my changes
Added Maya Directory
Added stuff to empty folders

n stuff
syncing
Merge remote-tracking branch 'origin/master'

Conflicts:
	GrandpaBlows/GrandpaBlows-csharp.sln
	GrandpaBlows/GrandpaBlows.sln
	GrandpaBlows/Library/assetDatabase3
	GrandpaBlows/Library/metadata/90/9069ff3d504c93343bc5c9a6d99a845b
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 18f3f8e5154194e1f48f42c7b63a6a8cedcbb87f.
Candle flame

Candle flame prefab
Added temp cake fbx file
Added cake prefab
Hopefully Reconciling

Adding some stuff, hope it doesn't break everything!
Candles

Candles in a group of 10, high and low res
cake textures
Made test scene
Merge remote-tracking branch 'origin/master'

Conflicts:
	GrandpaBlows/GrandpaBlows-csharp.sln
	GrandpaBlows/GrandpaBlows.sln
	GrandpaBlows/Library/CurrentLayout.dwlt
	GrandpaBlows/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	GrandpaBlows/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	GrandpaBlows/Library/assetDatabase3
	GrandpaBlows/Library/expandedItems
	GrandpaBlows/Library/guidmapper
Merge remote-tracking branch 'origin/master'

Conflicts:
	GrandpaBlows/GrandpaBlows-csharp.sln
	GrandpaBlows/GrandpaBlows.sln
	GrandpaBlows/Library/CurrentLayout.dwlt
	GrandpaBlows/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	GrandpaBlows/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	GrandpaBlows/Library/assetDatabase3
	GrandpaBlows/Library/expandedItems
	GrandpaBlows/Library/guidmapper
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 61d4db127221288edd41d9f40a3b77a1ce06bd58.
Merge remote-tracking branch 'origin/master'

Conflicts:
	GrandpaBlows/GrandpaBlows-csharp.sln
	GrandpaBlows/GrandpaBlows.sln
	GrandpaBlows/Library/CurrentLayout.dwlt
	GrandpaBlows/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	GrandpaBlows/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	GrandpaBlows/Library/assetDatabase3
	GrandpaBlows/Library/expandedItems
	GrandpaBlows/Library/guidmapper
added textures

for real this time
deleted old model folder
Changing Unity settings