tesla shield
Merge branch 'master' of https://github.com/kyle-piddington/JulyJam

Conflicts:
	Assets/GameAssets/Scripts/playerProperties.cs
	Assets/level1.unity