Does not work yet! Working on loading gems.
Merge branch 'master' of https://github.com/brawn/pump_up_the_jam

# By MIchael LeGrand (2) and MKaoSNC (2)
# Via MIchael LeGrand (1) and MKaoSNC (1)
* 'master' of https://github.com/brawn/pump_up_the_jam:
  adding animals
  Fixing some broken refs.
  Filling in temp stuff to test with.
  adding animal images

Conflicts:
	unity_project/Assets/Main.unity
Building the game logic.
meta files
Merge branch 'master' of https://github.com/brawn/pump_up_the_jam

# By Shawn
# Via Shawn
* 'master' of https://github.com/brawn/pump_up_the_jam:
  atlas and images
  art, atlas, and gameobject changes

Conflicts:
	unity_project/Assets/BrainJam/Art/Source.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0000_Spotted_Salamander.png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0001_salamander-3.png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0002_imgres.png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0003_images.png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0004_images-(2).png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0005_images-(1).png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0006_frog-jpg.png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0007_dtenebrosusmrw.png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0008_black-and-yellow-spotted-salamander.png.meta
	unity_project/Assets/BrainJam/Art/Source/Amphibian_0000s_0009_Amietophrynus_rangeri_Raucous_toad_Probable_mature_female_IMG_3715.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0000_wilbur-ugly-turkey.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0001_Tyto_alba_close_up.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0002_peregrine-falcon_659_600x450.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0003_mutantgenegi.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0004_imgres.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0005_images.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0006_Great-Horned-Owl.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0007_duck.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0008_bird-wallpaper-1920x1200-150.png.meta
	unity_project/Assets/BrainJam/Art/Source/Bird_0009_bald-eagle_1_600x450.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0000_tropicalfish.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0001_Ocean-Fish-Picture-690x460[1].png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0002_imgres2.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0003_imgres.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0004_images1.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0005_images.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0006_fsbdev2_021204.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0007_fishy.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0008_fish-06.png.meta
	unity_project/Assets/BrainJam/Art/Source/Fish_0000s_0009_Animals-Underwater-Fish--[1].png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0000_url.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0001_Turkish_Van_Cat.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0002_Roaring-Lion-Desktop-Hd-Wallpaper.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0003_imgres.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0004_images.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0005_Happy-Dolphin.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0006_giraffe_1.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0007_ferret_C.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0008_deer1.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_0000s_0009_6735.Pip-Bat-Chris-Shields-(rspb-images.com).png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_Bear_01.png.meta
	unity_project/Assets/BrainJam/Art/Source/Mammal_Cat_01.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0000_snake.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0001_reptiles-res-as_490090.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0002_reptiles_hero.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0003_reptile.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0004_o-SNAKES-facebook.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0005_images.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0006_crocodile-farm-3.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0007_Crocodile_02.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0008_Crocodile_01.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0009_Cobra.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0010_BlackMamba.png.meta
	unity_project/Assets/BrainJam/Art/Source/Reptile_0000s_0011_Alligator.png.meta
	unity_project/Assets/BrainJam/Script/GameLoop.cs
	unity_project/Assets/Main.unity
Merge branch 'master' of https://github.com/brawn/pump_up_the_jam

# By MIchael LeGrand
# Via MIchael LeGrand
* 'master' of https://github.com/brawn/pump_up_the_jam:
  Metafiles

Conflicts:
	unity_project/Assets/BrainJam/Art/Source.meta
	unity_project/Assets/BrainJam/Script/GameLoop.cs