balancing numbers woo
Merge branch 'dev' of https://github.com/BeaconOfDeath/DNAgame into dev

Conflicts:
	Assets/Scripts/PlayerScript.cs