balancing refill potion and putting soldiers in place
Merge branch 'master' of https://github.com/Alke-Games/Dauphine

Conflicts:
	include/LevelOne.h
	include/LevelTwo.h
	src/LevelTwo.cpp