GUI Manager & GUI Item. Have not tested it yet, but I will be sure to do that by the end of tommorow
Merge remote-tracking branch 'upstream/master' into GUI
GUI Manager
pushed up sample gui script
Deleted the start time parameter
Merge pull request #13 from adao1123/GUI

Gui Manager
Merge pull request #12 from ckhamash/master

Player movement and shooting coded. Merged in kirby master
pre-prototype release fixes
fixed up edge generation and added in level 1
Fixed edge detection to work all of the time and put in 4 levels
added in the rest of the enemy models
Merge pull request #14 from KirbyAu2/level1

Improved level generation and levels 1 through 5
Added in handling for an actual level system, camera lerping, improved GUI, and made a core that will persist through scenes
fix
Merge pull request #15 from KirbyAu2/livesAndRespawn

Lives, levels, respawning and more
Merge remote-tracking branch 'upstream/master' into update

Conflicts:
	Assets/Resources/Prefabs/Player/PlayerProjectile.prefab
	Assets/Scripts/Player/Player.cs
fixed merge issues