# Conflicts:
#	gframe/data_manager.h
#	gframe/image_manager.cpp
#	gframe/image_manager.h
#	gframe/sound_manager.cpp