shiep
Merge branch 'master' of https://github.com/zardoru/dotcur

Conflicts:
	src/ScreenGameplay7K.cpp
	src/ScreenGameplay7K.h