a
Merge branch 'master' of https://github.com/Bolt64/my_code

Conflicts:
	c_code/ex1
	c_code/ex1.c
	c_code/ex3
	c_code/ex3.c

sa