no message
Merge branch 'master' of https://github.com/fablman/austrian-game-jam-2014

Conflicts:
	Assets/Prefabs/Woman 1.prefab
	Assets/Scenes/rooms.unity
	Assets/Source/ObstacleGenerator.cs
	Assets/Source/Woman.cs
no message
Merge branch 'master' of https://github.com/fablman/austrian-game-jam-2014

Conflicts:
	Assets/Prefabs/Obstacle.prefab
	Assets/Scenes/rooms.unity
no message