TJ's additions and modifications
Added new prefab in my scene
Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'dev' into playerControls

Conflicts:
	Assets/Scenes/TJ_TestScene.unity
Added objects to my assigned scene
Merge branch 'dev' of https://github.com/Hehfay/Space-Adventure into dev
forgot to save scene
Edited my scene and added pickup prefab
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.
Merge branch 'dev' into playerControls
Merge branch 'dev' of https://github.com/Hehfay/Space-Adventure into dev

Conflicts:
	Assets/Scenes/MPG Scenes.meta
Updated the player movement script to interact with the bullets correctly.  This functionality still needs some work.
Modified my puzzle scene
Merge branch 'TJSceneDev' into dev
Merge branch 'dev' of https://github.com/Hehfay/Space-Adventure into dev
Banged the enemy prefabs into shape for minimally playable game.
Edited the player script so it will be destroyed when he gets hit 10 times.