conf
Merge branch 'master' of https://github.com/ipobornik/Telerik-OOP-2014-RPG-game-teamwork-Yellow-Bird
conf 2
Merge branch 'master' of https://github.com/ipobornik/Telerik-OOP-2014-RPG-game-teamwork-Yellow-Bird

Conflicts:
	test/test/test.cs