Merge .meta files
Merge branch 'master' of https://github.com/lucaslg/Ludum-Dare-31

Conflicts:
	Animation.meta
	Animation/Actions.meta
	Animation/Actions/Test.anim.meta
	Prefab.meta
	Prefab/AudimatBar.prefab.meta
	Prefab/FoxNewsCrawler.prefab.meta
	Scene.meta
	Script.meta
	Script/AlJazeera.cs.meta
	Script/CameraController.cs.meta
	Script/Channel.cs.meta
	Script/FoxNews.cs.meta
	Script/GUIAudimatBar.cs.meta
	Script/GameMode.cs.meta
	Script/GameState.cs.meta
	Script/InterestZone.cs.meta
	Script/NewsTicker.cs.meta
	Sprite.meta
	Sprite/aljazeera.psd.meta
	Sprite/background_placeholder.jpg.meta
	Sprite/buildings.png.meta
	Sprite/city.jpg.meta
	Sprite/foxnews.psd.meta
	Sprite/ground.png.meta