Fixed attack system. Now it says who's attacking you.
Merge branch 'master' of github.com:wnr/cprog13-game

# By Mathias Lindblom
# Via Mathias Lindblom
* 'master' of github.com:wnr/cprog13-game:
  Food finished
  Fixed override of find for lockableContainer
  Key and locks are now working

Conflicts:
	src/Character.cpp
	src/Character.h
	src/OwningStorage.h