src
Merge branch 'srcs'
checking the merge conflict
Conflicts:
	srcs/src/custom_type.c
	srcs/src/custom_type.h
	srcs/src/lua_math.c
	srcs/src/lua_math.h
	srcs/src/lua_tools.c
	srcs/src/lua_tools.h
	srcs/src/matrix_type.c
	srcs/src/matrix_type.h
	srcs/src/number_type.h
	srcs/src/vector_type.c
	srcs/src/vector_type.h
merge conflict resolved