forgot to save scene
Merge branch 'backup-enemyAI' into enemyAI
Added a number of small changes:
	* Edited the bullet.  The bullet can no longer crush the player.
	* Updated the enemy prefab gameObject and script.  I'm having
		some issues with getting the enemy prefab to work but i hope to
		have those issues resolved by tomorrow.
	* Updated the platform prefab so the edge colliders on it can no longer
		crush the player.
	* Updated the player information prefab to no longer be crushed by bullets or
		edge colliders
	* Added edge collider to Tags and bullet to Layers.
	* Scene changes just reflect the testing i've been working on.