bonus ex fixed
Merge branch 'master' of https://github.com/ShruikanTeam/eragon

Conflicts:
	TeamShruikan/EragonStructure/GameObjects/Player.cs