i love applesauce
Merge branch 'master' of https://github.com/minus-adam/nerf-wars

Conflicts:
	unity/Assets/References.meta
	unity/Assets/References/Animation_Frames.meta
	unity/Assets/References/Animation_Frames/Dummy_Animation_Takes.txt.meta

unity/Assets/References/Animation_Frames/Dummy_Annimation_Takes.txt.meta