Nothing
Merge branch 'sfml-migration' of github.com:ioa42/ld30 into sfml-migration
Boost for property tree and map (buggy)
Merge branch 'sfml-migration' of github.com:ioa42/ld30 into sfml-migration

Conflicts:
	Entity.cpp
	Entity.h
	Level.cpp