Merge branch 'master' of vogsphere.42berlin.de:vogsphere/intra-uuid-36531a4b-d625-4b5a-a931-8cbde3231205-7229277-kkaralyu

# Conflicts:
#	ft_putchar.c
