minor changes to LoginBox.cs(Nathan)
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2

Conflicts:
	Whale/Assets/Whale.unity
arg da pellets
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2

Conflicts:
	Whale/Assets/Whale.unity
Fixing pellets (Nathan v1.6
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2

Conflicts:
	Whale/Assets/Scripts/LoginBox.cs
Pellet stuff (Nathan v 1.7)
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2

Conflicts:
	Whale/Assets/Scripts/Player.cs
	Whale/Assets/Whale.unity