embers added from master
changed git ignore
change gitignore
delete meta
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Imported Assets/Meshes/AnimationRig_V3_enemy.ma.meta
	TrickyNinja/Assets/Imported Assets/Meshes/ragdoll_hero_naginata.ma.meta
5-1-2014 1734

end of thursdy merge