Update
Update vendredi midi
Mise a jour vendredi midi
Merge branch 'master' of https://github.com/AlbericTrancart/doom

Conflicts:
	cpp/CMakeLists.txt
	cpp/graphics.cpp
	cpp/headers/constants.h
	cpp/headers/graphics.h
	cpp/headers/map.h
	cpp/headers/player.h
	cpp/headers/utils.h
	cpp/main.cpp
	cpp/map.cpp
	cpp/player.cpp
	cpp/utils.cpp