pouwer:
Merge branch 'master' of https://github.com/Theo13/deathcurtain

Conflicts:
	src/Danmaku.hpp
	src/main.cpp
Merge branch 'master' of https://github.com/Theo13/deathcurtain

Conflicts:
	src/Danmaku.cpp
	src/Danmaku.hpp
	src/main.cpp
maj archi
Merge branch 'master' of https://github.com/Theo13/deathcurtain