Scheiß git
Merge branch 'master' of https://github.com/stupacki/CA_2014_PROJECT_DATA
Pull
Merge branch 'master' of https://github.com/stupacki/CA_2014_PROJECT_DATA
Leveldesign
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit
Rollback on last consistent Version
ReleaseMerge
ReleaseMerge

Conflicts:
	Project/Assembly-CSharp-firstpass-vs.csproj
	Project/Assembly-CSharp-firstpass.csproj
	Project/Assembly-CSharp-vs.csproj
	Project/Assembly-CSharp.csproj
	Project/Project-csharp.sln
	Project/Project.sln
ReleaseMerge
versucht findPath zu integrieren.
Merge
+FindPath
Merge branch 'master' of https://github.com/stupacki/CA_2014_PROJECT_DATA
reset speed
Bugfix
Merge

Conflicts:
	Project/Assets/Scripts/Charakter Scrips/FindPath.js
	Project/Assets/Scripts/Game Controller/GameController.js
	Project/Project-csharp.sln
	Project/Project.sln