changed roll input
Merge branch 'master' of https://github.com/fablman/austrian-game-jam-2014
Merge branch 'master' of https://github.com/fablman/austrian-game-jam-2014

Conflicts:
	Assets/Animations/swiss-animator-controller.controller
	Assets/Prefabs/Guard.prefab
	Assets/Prefabs/Hallway_1.prefab
	Assets/Prefabs/Hallway_2.prefab
	Assets/Prefabs/Woman 1.prefab
	Assets/Prefabs/door.prefab
	Assets/Scenes/rooms.unity
	Assets/Source/PlayerController.cs
	Assets/Source/RandomIntervalSpawner.cs
	Assets/Source/Woman.cs
Merge branch 'master' of https://github.com/fablman/austrian-game-jam-2014