Started creating the game world. Not finished yet.
Merge branch 'master' of github.com:wnr/cprog13-game

# By Mathias Lindblom
# Via Mathias Lindblom
* 'master' of github.com:wnr/cprog13-game:
  Added potion and a more general consumable class
  fix to durability

Conflicts:
	src/Engine.cpp