more fighting
Merge branch 'master' of https://github.com/thomas-burger/GameJam-15.2.2014

Conflicts:
	Assets/Room/Room.cs
	Assets/Scenes/scene.unity