game states
Merge branch 'master' of https://github.com/ShruikanTeam/eragon

Conflicts:
	TeamShruikan/EragonStructure/GameObjects/IPlayer.cs
	TeamShruikan/EragonStructure/GameObjects/Player.cs
	TeamShruikan/EragonStructure/bin/Debug/EragonStructure.pdb
	TeamShruikan/EragonStructure/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TeamShruikan/EragonStructure/obj/Debug/EragonStructure.csproj.FileListAbsolute.txt
	TeamShruikan/EragonStructure/obj/Debug/EragonStructure.csprojResolveAssemblyReference.cache
	TeamShruikan/EragonStructure/obj/Debug/EragonStructure.pdb