Message display
Merge branch 'master' of https://github.com/jonmann20/GameJam14

Conflicts:
	Assets/Animations/EnemyAnimationController.controller
	Assets/Animations/explosion.anim
	Assets/Resources/Bullet.prefab
	Assets/Resources/ChainLink.prefab
	Assets/Resources/Enemy.prefab
	Assets/Resources/PlayerPrimary.prefab
	Assets/Resources/PlayerSecondary.prefab
	Assets/Resources/SplitEnemy.prefab
	Assets/Scenes/main.unity
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/TagManager.asset
cross pdt
fix
Checking in
Checking in